From a16c7e14570df82a515960b430758fbfb5de72d6 Mon Sep 17 00:00:00 2001 From: Jason Del Ponte <961963+jasdel@users.noreply.github.com> Date: Tue, 30 Mar 2021 12:37:07 -0700 Subject: [PATCH] regenerate httpbinding services --- service/accessanalyzer/go.mod | 2 +- service/accessanalyzer/go.sum | 3 +- service/accessanalyzer/serializers.go | 216 +- service/amp/go.mod | 2 +- service/amp/go.sum | 3 +- service/amp/serializers.go | 45 +- service/amplify/go.mod | 2 +- service/amplify/go.sum | 3 +- service/amplify/serializers.go | 333 +-- service/amplifybackend/go.mod | 2 +- service/amplifybackend/go.sum | 3 +- service/amplifybackend/serializers.go | 216 +- service/apigateway/go.mod | 2 +- service/apigateway/go.sum | 3 +- service/apigateway/serializers.go | 1080 ++------- service/apigatewaymanagementapi/go.mod | 2 +- service/apigatewaymanagementapi/go.sum | 3 +- .../apigatewaymanagementapi/serializers.go | 27 +- service/apigatewayv2/go.mod | 2 +- service/apigatewayv2/go.sum | 3 +- service/apigatewayv2/serializers.go | 648 ++---- service/appconfig/go.mod | 2 +- service/appconfig/go.sum | 3 +- service/appconfig/serializers.go | 297 +-- service/appflow/go.mod | 2 +- service/appflow/go.sum | 3 +- service/appflow/serializers.go | 162 +- service/appintegrations/go.mod | 2 +- service/appintegrations/go.sum | 3 +- service/appintegrations/serializers.go | 81 +- service/appmesh/go.mod | 2 +- service/appmesh/go.sum | 3 +- service/appmesh/serializers.go | 342 +-- service/appsync/go.mod | 2 +- service/appsync/go.sum | 3 +- service/appsync/serializers.go | 369 +-- service/auditmanager/go.mod | 2 +- service/auditmanager/go.sum | 3 +- service/auditmanager/serializers.go | 459 +--- service/backup/go.mod | 2 +- service/backup/go.sum | 3 +- service/backup/serializers.go | 459 +--- service/batch/go.mod | 2 +- service/batch/go.sum | 3 +- service/batch/serializers.go | 171 +- service/braket/go.mod | 2 +- service/braket/go.sum | 3 +- service/braket/serializers.go | 81 +- service/chime/go.mod | 2 +- service/chime/go.sum | 3 +- service/chime/serializers.go | 1629 +++---------- service/clouddirectory/go.mod | 2 +- service/clouddirectory/go.sum | 3 +- service/clouddirectory/serializers.go | 594 ++--- service/cloudfront/go.mod | 2 +- service/cloudfront/go.sum | 3 +- service/cloudfront/serializers.go | 675 ++---- service/cloudsearchdomain/go.mod | 2 +- service/cloudsearchdomain/go.sum | 3 +- service/cloudsearchdomain/serializers.go | 27 +- service/codeartifact/go.mod | 2 +- service/codeartifact/go.sum | 3 +- service/codeartifact/serializers.go | 306 +-- service/codeguruprofiler/go.mod | 2 +- service/codeguruprofiler/go.sum | 3 +- service/codeguruprofiler/serializers.go | 207 +- service/codegurureviewer/go.mod | 2 +- service/codegurureviewer/go.sum | 3 +- service/codegurureviewer/serializers.go | 126 +- service/codestarnotifications/go.mod | 2 +- service/codestarnotifications/go.sum | 3 +- service/codestarnotifications/serializers.go | 117 +- service/cognitosync/go.mod | 2 +- service/cognitosync/go.sum | 3 +- service/cognitosync/serializers.go | 153 +- service/connect/go.mod | 2 +- service/connect/go.sum | 3 +- service/connect/serializers.go | 891 ++------ service/connectcontactlens/go.mod | 2 +- service/connectcontactlens/go.sum | 3 +- service/connectcontactlens/serializers.go | 9 +- service/connectparticipant/go.mod | 2 +- service/connectparticipant/go.sum | 3 +- service/connectparticipant/serializers.go | 72 +- service/customerprofiles/go.mod | 2 +- service/customerprofiles/go.sum | 3 +- service/customerprofiles/serializers.go | 252 +-- service/databrew/go.mod | 2 +- service/databrew/go.sum | 3 +- service/databrew/serializers.go | 351 +-- service/dataexchange/go.mod | 2 +- service/dataexchange/go.sum | 3 +- service/dataexchange/serializers.go | 198 +- service/detective/go.mod | 2 +- service/detective/go.sum | 3 +- service/detective/serializers.go | 108 +- service/devopsguru/go.mod | 2 +- service/devopsguru/go.sum | 3 +- service/devopsguru/serializers.go | 171 +- service/dlm/go.mod | 2 +- service/dlm/go.sum | 3 +- service/dlm/serializers.go | 72 +- service/ebs/go.mod | 2 +- service/ebs/go.sum | 3 +- service/ebs/serializers.go | 54 +- service/efs/go.mod | 2 +- service/efs/go.sum | 3 +- service/efs/serializers.go | 225 +- service/eks/go.mod | 2 +- service/eks/go.sum | 3 +- service/eks/serializers.go | 288 +-- service/elasticinference/go.mod | 2 +- service/elasticinference/go.sum | 3 +- service/elasticinference/serializers.go | 54 +- service/elasticsearchservice/go.mod | 2 +- service/elasticsearchservice/go.sum | 3 +- service/elasticsearchservice/serializers.go | 360 +-- service/elastictranscoder/go.mod | 2 +- service/elastictranscoder/go.sum | 3 +- service/elastictranscoder/serializers.go | 153 +- service/emrcontainers/go.mod | 2 +- service/emrcontainers/go.sum | 3 +- service/emrcontainers/serializers.go | 135 +- service/fis/go.mod | 2 +- service/fis/go.sum | 3 +- service/fis/serializers.go | 126 +- service/glacier/go.mod | 2 +- service/glacier/go.sum | 3 +- service/glacier/serializers.go | 297 +-- service/greengrass/go.mod | 2 +- service/greengrass/go.sum | 3 +- service/greengrass/serializers.go | 828 ++----- service/greengrassv2/go.mod | 2 +- service/greengrassv2/go.sum | 3 +- service/greengrassv2/serializers.go | 180 +- service/groundstation/go.mod | 2 +- service/groundstation/go.sum | 3 +- service/groundstation/serializers.go | 225 +- service/guardduty/go.mod | 2 +- service/guardduty/go.sum | 3 +- service/guardduty/serializers.go | 522 +---- service/honeycode/go.mod | 2 +- service/honeycode/go.sum | 3 +- service/honeycode/serializers.go | 108 +- service/imagebuilder/go.mod | 2 +- service/imagebuilder/go.sum | 3 +- service/imagebuilder/serializers.go | 441 +--- service/iot/go.mod | 2 +- service/iot/go.sum | 3 +- service/iot/serializers.go | 2007 ++++------------- service/iot1clickdevicesservice/go.mod | 2 +- service/iot1clickdevicesservice/go.sum | 3 +- .../iot1clickdevicesservice/serializers.go | 117 +- service/iot1clickprojects/go.mod | 2 +- service/iot1clickprojects/go.sum | 3 +- service/iot1clickprojects/serializers.go | 144 +- service/iotanalytics/go.mod | 2 +- service/iotanalytics/go.sum | 3 +- service/iotanalytics/serializers.go | 306 +-- service/iotdataplane/go.mod | 2 +- service/iotdataplane/go.sum | 3 +- service/iotdataplane/serializers.go | 45 +- service/iotdeviceadvisor/go.mod | 2 +- service/iotdeviceadvisor/go.sum | 3 +- service/iotdeviceadvisor/serializers.go | 117 +- service/iotevents/go.mod | 2 +- service/iotevents/go.sum | 3 +- service/iotevents/serializers.go | 171 +- service/ioteventsdata/go.mod | 2 +- service/ioteventsdata/go.sum | 3 +- service/ioteventsdata/serializers.go | 36 +- service/iotfleethub/go.mod | 2 +- service/iotfleethub/go.sum | 3 +- service/iotfleethub/serializers.go | 72 +- service/iotjobsdataplane/go.mod | 2 +- service/iotjobsdataplane/go.sum | 3 +- service/iotjobsdataplane/serializers.go | 36 +- service/iotsitewise/go.mod | 2 +- service/iotsitewise/go.sum | 3 +- service/iotsitewise/serializers.go | 513 +---- service/iotwireless/go.mod | 2 +- service/iotwireless/go.sum | 3 +- service/iotwireless/serializers.go | 459 +--- service/ivs/go.mod | 2 +- service/ivs/go.sum | 3 +- service/ivs/serializers.go | 198 +- service/kafka/go.mod | 2 +- service/kafka/go.sum | 3 +- service/kafka/serializers.go | 270 +-- service/kinesisvideo/go.mod | 2 +- service/kinesisvideo/go.sum | 3 +- service/kinesisvideo/serializers.go | 171 +- service/kinesisvideoarchivedmedia/go.mod | 2 +- service/kinesisvideoarchivedmedia/go.sum | 3 +- .../kinesisvideoarchivedmedia/serializers.go | 45 +- service/kinesisvideomedia/go.mod | 2 +- service/kinesisvideomedia/go.sum | 3 +- service/kinesisvideomedia/serializers.go | 9 +- service/kinesisvideosignaling/go.mod | 2 +- service/kinesisvideosignaling/go.sum | 3 +- service/kinesisvideosignaling/serializers.go | 18 +- service/lambda/go.mod | 2 +- service/lambda/go.sum | 3 +- service/lambda/serializers.go | 522 +---- service/lexmodelbuildingservice/go.mod | 2 +- service/lexmodelbuildingservice/go.sum | 3 +- .../lexmodelbuildingservice/serializers.go | 351 +-- service/lexmodelsv2/go.mod | 2 +- service/lexmodelsv2/go.sum | 3 +- service/lexmodelsv2/serializers.go | 360 +-- service/lexruntimeservice/go.mod | 2 +- service/lexruntimeservice/go.sum | 3 +- service/lexruntimeservice/serializers.go | 45 +- service/lexruntimev2/go.mod | 2 +- service/lexruntimev2/go.sum | 3 +- service/lexruntimev2/serializers.go | 45 +- service/lookoutvision/go.mod | 2 +- service/lookoutvision/go.sum | 3 +- service/lookoutvision/serializers.go | 171 +- service/macie2/go.mod | 2 +- service/macie2/go.sum | 3 +- service/macie2/serializers.go | 477 +--- service/managedblockchain/go.mod | 2 +- service/managedblockchain/go.sum | 3 +- service/managedblockchain/serializers.go | 207 +- service/marketplacecatalog/go.mod | 2 +- service/marketplacecatalog/go.sum | 3 +- service/marketplacecatalog/serializers.go | 54 +- service/mediaconnect/go.mod | 2 +- service/mediaconnect/go.sum | 3 +- service/mediaconnect/serializers.go | 243 +- service/mediaconvert/go.mod | 2 +- service/mediaconvert/go.sum | 3 +- service/mediaconvert/serializers.go | 225 +- service/medialive/go.mod | 2 +- service/medialive/go.sum | 3 +- service/medialive/serializers.go | 504 +---- service/mediapackage/go.mod | 2 +- service/mediapackage/go.sum | 3 +- service/mediapackage/serializers.go | 171 +- service/mediapackagevod/go.mod | 2 +- service/mediapackagevod/go.sum | 3 +- service/mediapackagevod/serializers.go | 153 +- service/mediastoredata/go.mod | 2 +- service/mediastoredata/go.sum | 3 +- service/mediastoredata/serializers.go | 45 +- service/mediatailor/go.mod | 2 +- service/mediatailor/go.sum | 3 +- service/mediatailor/serializers.go | 279 +-- service/mobile/go.mod | 2 +- service/mobile/go.sum | 3 +- service/mobile/serializers.go | 81 +- service/mq/go.mod | 2 +- service/mq/go.sum | 3 +- service/mq/serializers.go | 198 +- service/mwaa/go.mod | 2 +- service/mwaa/go.sum | 3 +- service/mwaa/serializers.go | 99 +- service/networkmanager/go.mod | 2 +- service/networkmanager/go.sum | 3 +- service/networkmanager/serializers.go | 315 +-- service/outposts/go.mod | 2 +- service/outposts/go.sum | 3 +- service/outposts/serializers.go | 90 +- service/personalizeevents/go.mod | 2 +- service/personalizeevents/go.sum | 3 +- service/personalizeevents/serializers.go | 27 +- service/personalizeruntime/go.mod | 2 +- service/personalizeruntime/go.sum | 3 +- service/personalizeruntime/serializers.go | 18 +- service/pinpoint/go.mod | 2 +- service/pinpoint/go.sum | 3 +- service/pinpoint/serializers.go | 1008 ++------- service/pinpointemail/go.mod | 2 +- service/pinpointemail/go.sum | 3 +- service/pinpointemail/serializers.go | 378 +--- service/pinpointsmsvoice/go.mod | 2 +- service/pinpointsmsvoice/go.sum | 3 +- service/pinpointsmsvoice/serializers.go | 72 +- service/polly/go.mod | 2 +- service/polly/go.sum | 3 +- service/polly/serializers.go | 81 +- service/qldb/go.mod | 2 +- service/qldb/go.sum | 3 +- service/qldb/serializers.go | 171 +- service/quicksight/go.mod | 2 +- service/quicksight/go.sum | 3 +- service/quicksight/serializers.go | 891 ++------ service/ram/go.mod | 2 +- service/ram/go.sum | 3 +- service/ram/serializers.go | 216 +- service/rdsdata/go.mod | 2 +- service/rdsdata/go.sum | 3 +- service/rdsdata/serializers.go | 54 +- service/resourcegroups/go.mod | 2 +- service/resourcegroups/go.sum | 3 +- service/resourcegroups/serializers.go | 144 +- service/robomaker/go.mod | 2 +- service/robomaker/go.sum | 3 +- service/robomaker/serializers.go | 513 +---- service/route53/go.mod | 2 +- service/route53/go.sum | 3 +- service/route53/serializers.go | 576 ++--- service/s3/go.mod | 2 +- service/s3/go.sum | 3 +- service/s3/internal/configtesting/go.mod | 6 - service/s3/internal/configtesting/go.sum | 3 +- service/s3/serializers.go | 819 ++----- service/s3control/go.mod | 2 +- service/s3control/go.sum | 3 +- service/s3control/serializers.go | 441 +--- service/s3outposts/go.mod | 2 +- service/s3outposts/go.sum | 3 +- service/s3outposts/serializers.go | 27 +- service/sagemakera2iruntime/go.mod | 2 +- service/sagemakera2iruntime/go.sum | 3 +- service/sagemakera2iruntime/serializers.go | 45 +- service/sagemakeredge/go.mod | 2 +- service/sagemakeredge/go.sum | 3 +- service/sagemakeredge/serializers.go | 18 +- service/sagemakerfeaturestoreruntime/go.mod | 2 +- service/sagemakerfeaturestoreruntime/go.sum | 3 +- .../serializers.go | 27 +- service/sagemakerruntime/go.mod | 2 +- service/sagemakerruntime/go.sum | 3 +- service/sagemakerruntime/serializers.go | 9 +- service/savingsplans/go.mod | 2 +- service/savingsplans/go.sum | 3 +- service/savingsplans/serializers.go | 81 +- service/schemas/go.mod | 2 +- service/schemas/go.sum | 3 +- service/schemas/serializers.go | 279 +-- service/securityhub/go.mod | 2 +- service/securityhub/go.sum | 3 +- service/securityhub/serializers.go | 432 +--- .../serverlessapplicationrepository/go.mod | 2 +- .../serverlessapplicationrepository/go.sum | 3 +- .../serializers.go | 126 +- service/servicecatalogappregistry/go.mod | 2 +- service/servicecatalogappregistry/go.sum | 3 +- .../servicecatalogappregistry/serializers.go | 180 +- service/sesv2/go.mod | 2 +- service/sesv2/go.sum | 3 +- service/sesv2/serializers.go | 729 ++---- service/signer/go.mod | 2 +- service/signer/go.sum | 3 +- service/signer/serializers.go | 153 +- service/sso/go.mod | 2 +- service/sso/go.sum | 3 +- service/sso/serializers.go | 36 +- service/ssooidc/go.mod | 2 +- service/ssooidc/go.sum | 3 +- service/ssooidc/serializers.go | 27 +- service/synthetics/go.mod | 2 +- service/synthetics/go.sum | 3 +- service/synthetics/serializers.go | 117 +- service/wellarchitected/go.mod | 2 +- service/wellarchitected/go.sum | 3 +- service/wellarchitected/serializers.go | 279 +-- service/workdocs/go.mod | 2 +- service/workdocs/go.sum | 3 +- service/workdocs/serializers.go | 369 +-- service/worklink/go.mod | 2 +- service/worklink/go.sum | 3 +- service/worklink/serializers.go | 297 +-- service/workmailmessageflow/go.mod | 2 +- service/workmailmessageflow/go.sum | 3 +- service/workmailmessageflow/serializers.go | 18 +- service/xray/go.mod | 2 +- service/xray/go.sum | 3 +- service/xray/serializers.go | 243 +- 371 files changed, 7751 insertions(+), 26083 deletions(-) diff --git a/service/accessanalyzer/go.mod b/service/accessanalyzer/go.mod index a607e4efc4f..cb77a4813b7 100644 --- a/service/accessanalyzer/go.mod +++ b/service/accessanalyzer/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/accessanalyzer/go.sum b/service/accessanalyzer/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/accessanalyzer/go.sum +++ b/service/accessanalyzer/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/accessanalyzer/serializers.go b/service/accessanalyzer/serializers.go index 0cd67b34785..f8983bb0b43 100644 --- a/service/accessanalyzer/serializers.go +++ b/service/accessanalyzer/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpApplyArchiveRule) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/archive-rule") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -119,13 +114,8 @@ func (m *awsRestjson1_serializeOpCreateAccessPreview) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/access-preview") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -204,13 +194,8 @@ func (m *awsRestjson1_serializeOpCreateAnalyzer) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/analyzer") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -301,13 +286,8 @@ func (m *awsRestjson1_serializeOpCreateArchiveRule) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/analyzer/{analyzerName}/archive-rule") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -399,13 +379,8 @@ func (m *awsRestjson1_serializeOpDeleteAnalyzer) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/analyzer/{analyzerName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -466,13 +441,8 @@ func (m *awsRestjson1_serializeOpDeleteArchiveRule) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/analyzer/{analyzerName}/archive-rule/{ruleName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -542,13 +512,8 @@ func (m *awsRestjson1_serializeOpGetAccessPreview) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/access-preview/{accessPreviewId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -609,13 +574,8 @@ func (m *awsRestjson1_serializeOpGetAnalyzedResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/analyzed-resource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -671,13 +631,8 @@ func (m *awsRestjson1_serializeOpGetAnalyzer) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/analyzer/{analyzerName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -734,13 +689,8 @@ func (m *awsRestjson1_serializeOpGetArchiveRule) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/analyzer/{analyzerName}/archive-rule/{ruleName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -806,13 +756,8 @@ func (m *awsRestjson1_serializeOpGetFinding) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/finding/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -873,13 +818,8 @@ func (m *awsRestjson1_serializeOpListAccessPreviewFindings) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/access-preview/{accessPreviewId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -976,13 +916,8 @@ func (m *awsRestjson1_serializeOpListAccessPreviews) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/access-preview") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1042,13 +977,8 @@ func (m *awsRestjson1_serializeOpListAnalyzedResources) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/analyzed-resource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1130,13 +1060,8 @@ func (m *awsRestjson1_serializeOpListAnalyzers) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/analyzer") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1196,13 +1121,8 @@ func (m *awsRestjson1_serializeOpListArchiveRules) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/analyzer/{analyzerName}/archive-rule") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1267,13 +1187,8 @@ func (m *awsRestjson1_serializeOpListFindings) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/finding") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1364,13 +1279,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1427,13 +1337,8 @@ func (m *awsRestjson1_serializeOpStartResourceScan) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/resource/scan") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1505,13 +1410,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1593,13 +1493,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1662,13 +1557,8 @@ func (m *awsRestjson1_serializeOpUpdateArchiveRule) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/analyzer/{analyzerName}/archive-rule/{ruleName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1764,13 +1654,8 @@ func (m *awsRestjson1_serializeOpUpdateFindings) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/finding") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1859,13 +1744,8 @@ func (m *awsRestjson1_serializeOpValidatePolicy) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/policy/validation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/amp/go.mod b/service/amp/go.mod index 30211d35663..3b5111fed0c 100644 --- a/service/amp/go.mod +++ b/service/amp/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/amp/go.sum b/service/amp/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/amp/go.sum +++ b/service/amp/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/amp/serializers.go b/service/amp/serializers.go index d4d89e8db84..35455e11bff 100644 --- a/service/amp/serializers.go +++ b/service/amp/serializers.go @@ -35,13 +35,8 @@ func (m *awsRestjson1_serializeOpCreateWorkspace) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/workspaces") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -113,13 +108,8 @@ func (m *awsRestjson1_serializeOpDeleteWorkspace) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/workspaces/{workspaceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -180,13 +170,8 @@ func (m *awsRestjson1_serializeOpDescribeWorkspace) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/workspaces/{workspaceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -243,13 +228,8 @@ func (m *awsRestjson1_serializeOpListWorkspaces) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/workspaces") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -309,13 +289,8 @@ func (m *awsRestjson1_serializeOpUpdateWorkspaceAlias) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/workspaces/{workspaceId}/alias") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/amplify/go.mod b/service/amplify/go.mod index bccf769834c..7a4b75a79ca 100644 --- a/service/amplify/go.mod +++ b/service/amplify/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/amplify/go.sum b/service/amplify/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/amplify/go.sum +++ b/service/amplify/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/amplify/serializers.go b/service/amplify/serializers.go index 931248aff9d..82202d462fb 100644 --- a/service/amplify/serializers.go +++ b/service/amplify/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpCreateApp) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/apps") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -210,13 +205,8 @@ func (m *awsRestjson1_serializeOpCreateBackendEnvironment) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/backendenvironments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -306,13 +296,8 @@ func (m *awsRestjson1_serializeOpCreateBranch) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/branches") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -476,13 +461,8 @@ func (m *awsRestjson1_serializeOpCreateDeployment) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/branches/{branchName}/deployments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -573,13 +553,8 @@ func (m *awsRestjson1_serializeOpCreateDomainAssociation) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/domains") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -683,13 +658,8 @@ func (m *awsRestjson1_serializeOpCreateWebhook) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/webhooks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -774,13 +744,8 @@ func (m *awsRestjson1_serializeOpDeleteApp) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -837,13 +802,8 @@ func (m *awsRestjson1_serializeOpDeleteBackendEnvironment) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/backendenvironments/{environmentName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -909,13 +869,8 @@ func (m *awsRestjson1_serializeOpDeleteBranch) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/branches/{branchName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -981,13 +936,8 @@ func (m *awsRestjson1_serializeOpDeleteDomainAssociation) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/domains/{domainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1053,13 +1003,8 @@ func (m *awsRestjson1_serializeOpDeleteJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/branches/{branchName}/jobs/{jobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1134,13 +1079,8 @@ func (m *awsRestjson1_serializeOpDeleteWebhook) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/webhooks/{webhookId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1197,13 +1137,8 @@ func (m *awsRestjson1_serializeOpGenerateAccessLogs) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/accesslogs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1293,13 +1228,8 @@ func (m *awsRestjson1_serializeOpGetApp) HandleSerialize(ctx context.Context, in } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1356,13 +1286,8 @@ func (m *awsRestjson1_serializeOpGetArtifactUrl) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/artifacts/{artifactId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1419,13 +1344,8 @@ func (m *awsRestjson1_serializeOpGetBackendEnvironment) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/backendenvironments/{environmentName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1491,13 +1411,8 @@ func (m *awsRestjson1_serializeOpGetBranch) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/branches/{branchName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1563,13 +1478,8 @@ func (m *awsRestjson1_serializeOpGetDomainAssociation) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/domains/{domainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1635,13 +1545,8 @@ func (m *awsRestjson1_serializeOpGetJob) HandleSerialize(ctx context.Context, in } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/branches/{branchName}/jobs/{jobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1716,13 +1621,8 @@ func (m *awsRestjson1_serializeOpGetWebhook) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/webhooks/{webhookId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1779,13 +1679,8 @@ func (m *awsRestjson1_serializeOpListApps) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/apps") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1841,13 +1736,8 @@ func (m *awsRestjson1_serializeOpListArtifacts) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/branches/{branchName}/jobs/{jobId}/artifacts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1930,13 +1820,8 @@ func (m *awsRestjson1_serializeOpListBackendEnvironments) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/backendenvironments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2005,13 +1890,8 @@ func (m *awsRestjson1_serializeOpListBranches) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/branches") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2076,13 +1956,8 @@ func (m *awsRestjson1_serializeOpListDomainAssociations) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/domains") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2147,13 +2022,8 @@ func (m *awsRestjson1_serializeOpListJobs) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/branches/{branchName}/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2227,13 +2097,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2290,13 +2155,8 @@ func (m *awsRestjson1_serializeOpListWebhooks) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/webhooks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2361,13 +2221,8 @@ func (m *awsRestjson1_serializeOpStartDeployment) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/branches/{branchName}/deployments/start") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2461,13 +2316,8 @@ func (m *awsRestjson1_serializeOpStartJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/branches/{branchName}/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2581,13 +2431,8 @@ func (m *awsRestjson1_serializeOpStopJob) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/branches/{branchName}/jobs/{jobId}/stop") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2662,13 +2507,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2750,13 +2590,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2819,13 +2654,8 @@ func (m *awsRestjson1_serializeOpUpdateApp) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2998,13 +2828,8 @@ func (m *awsRestjson1_serializeOpUpdateBranch) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/branches/{branchName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3165,13 +2990,8 @@ func (m *awsRestjson1_serializeOpUpdateDomainAssociation) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/apps/{appId}/domains/{domainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3279,13 +3099,8 @@ func (m *awsRestjson1_serializeOpUpdateWebhook) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/webhooks/{webhookId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/amplifybackend/go.mod b/service/amplifybackend/go.mod index e20b34e185b..1e1e5df3544 100644 --- a/service/amplifybackend/go.mod +++ b/service/amplifybackend/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/amplifybackend/go.sum b/service/amplifybackend/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/amplifybackend/go.sum +++ b/service/amplifybackend/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/amplifybackend/serializers.go b/service/amplifybackend/serializers.go index c6c2cafc453..fe16d1ba27b 100644 --- a/service/amplifybackend/serializers.go +++ b/service/amplifybackend/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCloneBackend) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/environments/{BackendEnvironmentName}/clone") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -131,13 +126,8 @@ func (m *awsRestjson1_serializeOpCreateBackend) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/backend") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -226,13 +216,8 @@ func (m *awsRestjson1_serializeOpCreateBackendAPI) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/api") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -324,13 +309,8 @@ func (m *awsRestjson1_serializeOpCreateBackendAuth) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/auth") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -422,13 +402,8 @@ func (m *awsRestjson1_serializeOpCreateBackendConfig) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -508,13 +483,8 @@ func (m *awsRestjson1_serializeOpCreateToken) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/challenge") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -571,13 +541,8 @@ func (m *awsRestjson1_serializeOpDeleteBackend) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/environments/{BackendEnvironmentName}/remove") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -643,13 +608,8 @@ func (m *awsRestjson1_serializeOpDeleteBackendAPI) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/api/{BackendEnvironmentName}/remove") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -745,13 +705,8 @@ func (m *awsRestjson1_serializeOpDeleteBackendAuth) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/auth/{BackendEnvironmentName}/remove") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -840,13 +795,8 @@ func (m *awsRestjson1_serializeOpDeleteToken) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/challenge/{SessionId}/remove") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -912,13 +862,8 @@ func (m *awsRestjson1_serializeOpGenerateBackendAPIModels) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/api/{BackendEnvironmentName}/generateModels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1007,13 +952,8 @@ func (m *awsRestjson1_serializeOpGetBackend) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/details") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1093,13 +1033,8 @@ func (m *awsRestjson1_serializeOpGetBackendAPI) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/api/{BackendEnvironmentName}/details") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1195,13 +1130,8 @@ func (m *awsRestjson1_serializeOpGetBackendAPIModels) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/api/{BackendEnvironmentName}/getModels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1290,13 +1220,8 @@ func (m *awsRestjson1_serializeOpGetBackendAuth) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/auth/{BackendEnvironmentName}/details") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1385,13 +1310,8 @@ func (m *awsRestjson1_serializeOpGetBackendJob) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/job/{BackendEnvironmentName}/{JobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1466,13 +1386,8 @@ func (m *awsRestjson1_serializeOpGetToken) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/challenge/{SessionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1538,13 +1453,8 @@ func (m *awsRestjson1_serializeOpListBackendJobs) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/job/{BackendEnvironmentName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1653,13 +1563,8 @@ func (m *awsRestjson1_serializeOpRemoveAllBackends) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/remove") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1739,13 +1644,8 @@ func (m *awsRestjson1_serializeOpRemoveBackendConfig) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/config/remove") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1802,13 +1702,8 @@ func (m *awsRestjson1_serializeOpUpdateBackendAPI) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/api/{BackendEnvironmentName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1904,13 +1799,8 @@ func (m *awsRestjson1_serializeOpUpdateBackendAuth) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/auth/{BackendEnvironmentName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2006,13 +1896,8 @@ func (m *awsRestjson1_serializeOpUpdateBackendConfig) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/config/update") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2094,13 +1979,8 @@ func (m *awsRestjson1_serializeOpUpdateBackendJob) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/backend/{AppId}/job/{BackendEnvironmentName}/{JobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/apigateway/go.mod b/service/apigateway/go.mod index 046c6d06483..a2289d8fba1 100644 --- a/service/apigateway/go.mod +++ b/service/apigateway/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/apigateway/go.sum b/service/apigateway/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/apigateway/go.sum +++ b/service/apigateway/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/apigateway/serializers.go b/service/apigateway/serializers.go index 4742e168c4a..2b4f9085f2f 100644 --- a/service/apigateway/serializers.go +++ b/service/apigateway/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateApiKey) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/apikeys") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -148,13 +143,8 @@ func (m *awsRestjson1_serializeOpCreateAuthorizer) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/authorizers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -276,13 +266,8 @@ func (m *awsRestjson1_serializeOpCreateBasePathMapping) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/domainnames/{domainName}/basepathmappings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -372,13 +357,8 @@ func (m *awsRestjson1_serializeOpCreateDeployment) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/deployments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -497,13 +477,8 @@ func (m *awsRestjson1_serializeOpCreateDocumentationPart) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/documentation/parts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -590,13 +565,8 @@ func (m *awsRestjson1_serializeOpCreateDocumentationVersion) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/documentation/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -686,13 +656,8 @@ func (m *awsRestjson1_serializeOpCreateDomainName) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/domainnames") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -820,13 +785,8 @@ func (m *awsRestjson1_serializeOpCreateModel) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/models") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -921,13 +881,8 @@ func (m *awsRestjson1_serializeOpCreateRequestValidator) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/requestvalidators") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1017,13 +972,8 @@ func (m *awsRestjson1_serializeOpCreateResource) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{parentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1112,13 +1062,8 @@ func (m *awsRestjson1_serializeOpCreateRestApi) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/restapis") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1241,13 +1186,8 @@ func (m *awsRestjson1_serializeOpCreateStage) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/stages") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1378,13 +1318,8 @@ func (m *awsRestjson1_serializeOpCreateUsagePlan) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/usageplans") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1484,13 +1419,8 @@ func (m *awsRestjson1_serializeOpCreateUsagePlanKey) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/usageplans/{usagePlanId}/keys") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1575,13 +1505,8 @@ func (m *awsRestjson1_serializeOpCreateVpcLink) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/vpclinks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1667,13 +1592,8 @@ func (m *awsRestjson1_serializeOpDeleteApiKey) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/apikeys/{apiKey}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1730,13 +1650,8 @@ func (m *awsRestjson1_serializeOpDeleteAuthorizer) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/authorizers/{authorizerId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1802,13 +1717,8 @@ func (m *awsRestjson1_serializeOpDeleteBasePathMapping) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/domainnames/{domainName}/basepathmappings/{basePath}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1874,13 +1784,8 @@ func (m *awsRestjson1_serializeOpDeleteClientCertificate) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/clientcertificates/{clientCertificateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1937,13 +1842,8 @@ func (m *awsRestjson1_serializeOpDeleteDeployment) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/deployments/{deploymentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2009,13 +1909,8 @@ func (m *awsRestjson1_serializeOpDeleteDocumentationPart) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/documentation/parts/{documentationPartId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2081,13 +1976,8 @@ func (m *awsRestjson1_serializeOpDeleteDocumentationVersion) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/documentation/versions/{documentationVersion}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2153,13 +2043,8 @@ func (m *awsRestjson1_serializeOpDeleteDomainName) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/domainnames/{domainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2216,13 +2101,8 @@ func (m *awsRestjson1_serializeOpDeleteGatewayResponse) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/gatewayresponses/{responseType}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2288,13 +2168,8 @@ func (m *awsRestjson1_serializeOpDeleteIntegration) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}/integration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2369,13 +2244,8 @@ func (m *awsRestjson1_serializeOpDeleteIntegrationResponse) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}/integration/responses/{statusCode}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2459,13 +2329,8 @@ func (m *awsRestjson1_serializeOpDeleteMethod) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2540,13 +2405,8 @@ func (m *awsRestjson1_serializeOpDeleteMethodResponse) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}/responses/{statusCode}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2630,13 +2490,8 @@ func (m *awsRestjson1_serializeOpDeleteModel) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/models/{modelName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2702,13 +2557,8 @@ func (m *awsRestjson1_serializeOpDeleteRequestValidator) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/requestvalidators/{requestValidatorId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2774,13 +2624,8 @@ func (m *awsRestjson1_serializeOpDeleteResource) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2846,13 +2691,8 @@ func (m *awsRestjson1_serializeOpDeleteRestApi) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2909,13 +2749,8 @@ func (m *awsRestjson1_serializeOpDeleteStage) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/stages/{stageName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2981,13 +2816,8 @@ func (m *awsRestjson1_serializeOpDeleteUsagePlan) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/usageplans/{usagePlanId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3044,13 +2874,8 @@ func (m *awsRestjson1_serializeOpDeleteUsagePlanKey) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/usageplans/{usagePlanId}/keys/{keyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3116,13 +2941,8 @@ func (m *awsRestjson1_serializeOpDeleteVpcLink) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/vpclinks/{vpcLinkId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3179,13 +2999,8 @@ func (m *awsRestjson1_serializeOpFlushStageAuthorizersCache) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/stages/{stageName}/cache/authorizers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3251,13 +3066,8 @@ func (m *awsRestjson1_serializeOpFlushStageCache) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/stages/{stageName}/cache/data") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3323,13 +3133,8 @@ func (m *awsRestjson1_serializeOpGenerateClientCertificate) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/clientcertificates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3403,13 +3208,8 @@ func (m *awsRestjson1_serializeOpGetAccount) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/account") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3453,13 +3253,8 @@ func (m *awsRestjson1_serializeOpGetApiKey) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/apikeys/{apiKey}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3520,13 +3315,8 @@ func (m *awsRestjson1_serializeOpGetApiKeys) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/apikeys") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3594,13 +3384,8 @@ func (m *awsRestjson1_serializeOpGetAuthorizer) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/authorizers/{authorizerId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3666,13 +3451,8 @@ func (m *awsRestjson1_serializeOpGetAuthorizers) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/authorizers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3737,13 +3517,8 @@ func (m *awsRestjson1_serializeOpGetBasePathMapping) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/domainnames/{domainName}/basepathmappings/{basePath}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3809,13 +3584,8 @@ func (m *awsRestjson1_serializeOpGetBasePathMappings) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/domainnames/{domainName}/basepathmappings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3880,13 +3650,8 @@ func (m *awsRestjson1_serializeOpGetClientCertificate) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/clientcertificates/{clientCertificateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3943,13 +3708,8 @@ func (m *awsRestjson1_serializeOpGetClientCertificates) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/clientcertificates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4005,13 +3765,8 @@ func (m *awsRestjson1_serializeOpGetDeployment) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/deployments/{deploymentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4083,13 +3838,8 @@ func (m *awsRestjson1_serializeOpGetDeployments) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/deployments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4154,13 +3904,8 @@ func (m *awsRestjson1_serializeOpGetDocumentationPart) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/documentation/parts/{documentationPartId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4226,13 +3971,8 @@ func (m *awsRestjson1_serializeOpGetDocumentationParts) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/documentation/parts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4313,13 +4053,8 @@ func (m *awsRestjson1_serializeOpGetDocumentationVersion) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/documentation/versions/{documentationVersion}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4385,13 +4120,8 @@ func (m *awsRestjson1_serializeOpGetDocumentationVersions) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/documentation/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4456,13 +4186,8 @@ func (m *awsRestjson1_serializeOpGetDomainName) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/domainnames/{domainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4519,13 +4244,8 @@ func (m *awsRestjson1_serializeOpGetDomainNames) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/domainnames") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4581,13 +4301,8 @@ func (m *awsRestjson1_serializeOpGetExport) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/stages/{stageName}/exports/{exportType}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4692,13 +4407,8 @@ func (m *awsRestjson1_serializeOpGetGatewayResponse) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/gatewayresponses/{responseType}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4764,13 +4474,8 @@ func (m *awsRestjson1_serializeOpGetGatewayResponses) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/gatewayresponses") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4835,13 +4540,8 @@ func (m *awsRestjson1_serializeOpGetIntegration) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}/integration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4916,13 +4616,8 @@ func (m *awsRestjson1_serializeOpGetIntegrationResponse) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}/integration/responses/{statusCode}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5006,13 +4701,8 @@ func (m *awsRestjson1_serializeOpGetMethod) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5087,13 +4777,8 @@ func (m *awsRestjson1_serializeOpGetMethodResponse) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}/responses/{statusCode}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5177,13 +4862,8 @@ func (m *awsRestjson1_serializeOpGetModel) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/models/{modelName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5253,13 +4933,8 @@ func (m *awsRestjson1_serializeOpGetModels) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/models") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5324,13 +4999,8 @@ func (m *awsRestjson1_serializeOpGetModelTemplate) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/models/{modelName}/default_template") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5396,13 +5066,8 @@ func (m *awsRestjson1_serializeOpGetRequestValidator) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/requestvalidators/{requestValidatorId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5468,13 +5133,8 @@ func (m *awsRestjson1_serializeOpGetRequestValidators) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/requestvalidators") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5539,13 +5199,8 @@ func (m *awsRestjson1_serializeOpGetResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5617,13 +5272,8 @@ func (m *awsRestjson1_serializeOpGetResources) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5694,13 +5344,8 @@ func (m *awsRestjson1_serializeOpGetRestApi) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5757,13 +5402,8 @@ func (m *awsRestjson1_serializeOpGetRestApis) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/restapis") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5819,13 +5459,8 @@ func (m *awsRestjson1_serializeOpGetSdk) HandleSerialize(ctx context.Context, in } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/stages/{stageName}/sdks/{sdkType}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5925,13 +5560,8 @@ func (m *awsRestjson1_serializeOpGetSdkType) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/sdktypes/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5988,13 +5618,8 @@ func (m *awsRestjson1_serializeOpGetSdkTypes) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/sdktypes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6050,13 +5675,8 @@ func (m *awsRestjson1_serializeOpGetStage) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/stages/{stageName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6122,13 +5742,8 @@ func (m *awsRestjson1_serializeOpGetStages) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/stages") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6189,13 +5804,8 @@ func (m *awsRestjson1_serializeOpGetTags) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6260,13 +5870,8 @@ func (m *awsRestjson1_serializeOpGetUsage) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/usageplans/{usagePlanId}/usage") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6343,13 +5948,8 @@ func (m *awsRestjson1_serializeOpGetUsagePlan) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/usageplans/{usagePlanId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6406,13 +6006,8 @@ func (m *awsRestjson1_serializeOpGetUsagePlanKey) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/usageplans/{usagePlanId}/keys/{keyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6478,13 +6073,8 @@ func (m *awsRestjson1_serializeOpGetUsagePlanKeys) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/usageplans/{usagePlanId}/keys") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6553,13 +6143,8 @@ func (m *awsRestjson1_serializeOpGetUsagePlans) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/usageplans") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6619,13 +6204,8 @@ func (m *awsRestjson1_serializeOpGetVpcLink) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/vpclinks/{vpcLinkId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6682,13 +6262,8 @@ func (m *awsRestjson1_serializeOpGetVpcLinks) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/vpclinks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6744,13 +6319,8 @@ func (m *awsRestjson1_serializeOpImportApiKeys) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/apikeys?mode=import") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6806,13 +6376,8 @@ func (m *awsRestjson1_serializeOpImportDocumentationParts) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/documentation/parts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6877,13 +6442,8 @@ func (m *awsRestjson1_serializeOpImportRestApi) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/restapis?mode=import") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6960,13 +6520,8 @@ func (m *awsRestjson1_serializeOpPutGatewayResponse) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/gatewayresponses/{responseType}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7069,13 +6624,8 @@ func (m *awsRestjson1_serializeOpPutIntegration) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}/integration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7246,13 +6796,8 @@ func (m *awsRestjson1_serializeOpPutIntegrationResponse) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}/integration/responses/{statusCode}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7378,13 +6923,8 @@ func (m *awsRestjson1_serializeOpPutMethod) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7523,13 +7063,8 @@ func (m *awsRestjson1_serializeOpPutMethodResponse) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}/responses/{statusCode}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7645,13 +7180,8 @@ func (m *awsRestjson1_serializeOpPutRestApi) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7741,13 +7271,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7829,13 +7354,8 @@ func (m *awsRestjson1_serializeOpTestInvokeAuthorizer) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/authorizers/{authorizerId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7957,13 +7477,8 @@ func (m *awsRestjson1_serializeOpTestInvokeMethod) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8092,13 +7607,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8161,13 +7671,8 @@ func (m *awsRestjson1_serializeOpUpdateAccount) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/account") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8236,13 +7741,8 @@ func (m *awsRestjson1_serializeOpUpdateApiKey) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/apikeys/{apiKey}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8324,13 +7824,8 @@ func (m *awsRestjson1_serializeOpUpdateAuthorizer) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/authorizers/{authorizerId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8421,13 +7916,8 @@ func (m *awsRestjson1_serializeOpUpdateBasePathMapping) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/domainnames/{domainName}/basepathmappings/{basePath}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8518,13 +8008,8 @@ func (m *awsRestjson1_serializeOpUpdateClientCertificate) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/clientcertificates/{clientCertificateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8606,13 +8091,8 @@ func (m *awsRestjson1_serializeOpUpdateDeployment) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/deployments/{deploymentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8703,13 +8183,8 @@ func (m *awsRestjson1_serializeOpUpdateDocumentationPart) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/documentation/parts/{documentationPartId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8800,13 +8275,8 @@ func (m *awsRestjson1_serializeOpUpdateDocumentationVersion) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/documentation/versions/{documentationVersion}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8897,13 +8367,8 @@ func (m *awsRestjson1_serializeOpUpdateDomainName) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/domainnames/{domainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8985,13 +8450,8 @@ func (m *awsRestjson1_serializeOpUpdateGatewayResponse) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/gatewayresponses/{responseType}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9082,13 +8542,8 @@ func (m *awsRestjson1_serializeOpUpdateIntegration) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}/integration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9188,13 +8643,8 @@ func (m *awsRestjson1_serializeOpUpdateIntegrationResponse) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}/integration/responses/{statusCode}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9303,13 +8753,8 @@ func (m *awsRestjson1_serializeOpUpdateMethod) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9409,13 +8854,8 @@ func (m *awsRestjson1_serializeOpUpdateMethodResponse) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}/methods/{httpMethod}/responses/{statusCode}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9524,13 +8964,8 @@ func (m *awsRestjson1_serializeOpUpdateModel) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/models/{modelName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9621,13 +9056,8 @@ func (m *awsRestjson1_serializeOpUpdateRequestValidator) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/requestvalidators/{requestValidatorId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9718,13 +9148,8 @@ func (m *awsRestjson1_serializeOpUpdateResource) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/resources/{resourceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9815,13 +9240,8 @@ func (m *awsRestjson1_serializeOpUpdateRestApi) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9903,13 +9323,8 @@ func (m *awsRestjson1_serializeOpUpdateStage) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/restapis/{restApiId}/stages/{stageName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10000,13 +9415,8 @@ func (m *awsRestjson1_serializeOpUpdateUsage) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/usageplans/{usagePlanId}/keys/{keyId}/usage") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10097,13 +9507,8 @@ func (m *awsRestjson1_serializeOpUpdateUsagePlan) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/usageplans/{usagePlanId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10185,13 +9590,8 @@ func (m *awsRestjson1_serializeOpUpdateVpcLink) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/vpclinks/{vpcLinkId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/apigatewaymanagementapi/go.mod b/service/apigatewaymanagementapi/go.mod index 3071de66b4d..e39a0152efe 100644 --- a/service/apigatewaymanagementapi/go.mod +++ b/service/apigatewaymanagementapi/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/apigatewaymanagementapi/go.sum b/service/apigatewaymanagementapi/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/apigatewaymanagementapi/go.sum +++ b/service/apigatewaymanagementapi/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/apigatewaymanagementapi/serializers.go b/service/apigatewaymanagementapi/serializers.go index 518d7f1083f..cad51fb9b8d 100644 --- a/service/apigatewaymanagementapi/serializers.go +++ b/service/apigatewaymanagementapi/serializers.go @@ -34,13 +34,8 @@ func (m *awsRestjson1_serializeOpDeleteConnection) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/@connections/{ConnectionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -97,13 +92,8 @@ func (m *awsRestjson1_serializeOpGetConnection) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/@connections/{ConnectionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -160,13 +150,8 @@ func (m *awsRestjson1_serializeOpPostToConnection) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/@connections/{ConnectionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/apigatewayv2/go.mod b/service/apigatewayv2/go.mod index 64fbc3eb528..2f805a0114d 100644 --- a/service/apigatewayv2/go.mod +++ b/service/apigatewayv2/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/apigatewayv2/go.sum b/service/apigatewayv2/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/apigatewayv2/go.sum +++ b/service/apigatewayv2/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/apigatewayv2/serializers.go b/service/apigatewayv2/serializers.go index 45965d7af6d..083813a2371 100644 --- a/service/apigatewayv2/serializers.go +++ b/service/apigatewayv2/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpCreateApi) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v2/apis") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -174,13 +169,8 @@ func (m *awsRestjson1_serializeOpCreateApiMapping) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/domainnames/{DomainName}/apimappings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -270,13 +260,8 @@ func (m *awsRestjson1_serializeOpCreateAuthorizer) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/authorizers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -405,13 +390,8 @@ func (m *awsRestjson1_serializeOpCreateDeployment) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/deployments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -496,13 +476,8 @@ func (m *awsRestjson1_serializeOpCreateDomainName) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/domainnames") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -590,13 +565,8 @@ func (m *awsRestjson1_serializeOpCreateIntegration) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/integrations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -764,13 +734,8 @@ func (m *awsRestjson1_serializeOpCreateIntegrationResponse) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/integrations/{IntegrationId}/integrationresponses") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -883,13 +848,8 @@ func (m *awsRestjson1_serializeOpCreateModel) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/models") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -984,13 +944,8 @@ func (m *awsRestjson1_serializeOpCreateRoute) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/routes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1126,13 +1081,8 @@ func (m *awsRestjson1_serializeOpCreateRouteResponse) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/routes/{RouteId}/routeresponses") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1240,13 +1190,8 @@ func (m *awsRestjson1_serializeOpCreateStage) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/stages") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1381,13 +1326,8 @@ func (m *awsRestjson1_serializeOpCreateVpcLink) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v2/vpclinks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1475,13 +1415,8 @@ func (m *awsRestjson1_serializeOpDeleteAccessLogSettings) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/stages/{StageName}/accesslogsettings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1547,13 +1482,8 @@ func (m *awsRestjson1_serializeOpDeleteApi) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1610,13 +1540,8 @@ func (m *awsRestjson1_serializeOpDeleteApiMapping) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/domainnames/{DomainName}/apimappings/{ApiMappingId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1682,13 +1607,8 @@ func (m *awsRestjson1_serializeOpDeleteAuthorizer) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/authorizers/{AuthorizerId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1754,13 +1674,8 @@ func (m *awsRestjson1_serializeOpDeleteCorsConfiguration) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/cors") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1817,13 +1732,8 @@ func (m *awsRestjson1_serializeOpDeleteDeployment) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/deployments/{DeploymentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1889,13 +1799,8 @@ func (m *awsRestjson1_serializeOpDeleteDomainName) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/domainnames/{DomainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1952,13 +1857,8 @@ func (m *awsRestjson1_serializeOpDeleteIntegration) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/integrations/{IntegrationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2024,13 +1924,8 @@ func (m *awsRestjson1_serializeOpDeleteIntegrationResponse) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/integrations/{IntegrationId}/integrationresponses/{IntegrationResponseId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2105,13 +2000,8 @@ func (m *awsRestjson1_serializeOpDeleteModel) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/models/{ModelId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2177,13 +2067,8 @@ func (m *awsRestjson1_serializeOpDeleteRoute) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/routes/{RouteId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2249,13 +2134,8 @@ func (m *awsRestjson1_serializeOpDeleteRouteRequestParameter) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/routes/{RouteId}/requestparameters/{RequestParameterKey}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2330,13 +2210,8 @@ func (m *awsRestjson1_serializeOpDeleteRouteResponse) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/routes/{RouteId}/routeresponses/{RouteResponseId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2411,13 +2286,8 @@ func (m *awsRestjson1_serializeOpDeleteRouteSettings) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/stages/{StageName}/routesettings/{RouteKey}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2492,13 +2362,8 @@ func (m *awsRestjson1_serializeOpDeleteStage) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/stages/{StageName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2564,13 +2429,8 @@ func (m *awsRestjson1_serializeOpDeleteVpcLink) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v2/vpclinks/{VpcLinkId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2627,13 +2487,8 @@ func (m *awsRestjson1_serializeOpExportApi) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/exports/{Specification}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2715,13 +2570,8 @@ func (m *awsRestjson1_serializeOpGetApi) HandleSerialize(ctx context.Context, in } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2778,13 +2628,8 @@ func (m *awsRestjson1_serializeOpGetApiMapping) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v2/domainnames/{DomainName}/apimappings/{ApiMappingId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2850,13 +2695,8 @@ func (m *awsRestjson1_serializeOpGetApiMappings) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v2/domainnames/{DomainName}/apimappings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2921,13 +2761,8 @@ func (m *awsRestjson1_serializeOpGetApis) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/v2/apis") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2983,13 +2818,8 @@ func (m *awsRestjson1_serializeOpGetAuthorizer) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/authorizers/{AuthorizerId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3055,13 +2885,8 @@ func (m *awsRestjson1_serializeOpGetAuthorizers) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/authorizers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3126,13 +2951,8 @@ func (m *awsRestjson1_serializeOpGetDeployment) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/deployments/{DeploymentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3198,13 +3018,8 @@ func (m *awsRestjson1_serializeOpGetDeployments) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/deployments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3269,13 +3084,8 @@ func (m *awsRestjson1_serializeOpGetDomainName) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v2/domainnames/{DomainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3332,13 +3142,8 @@ func (m *awsRestjson1_serializeOpGetDomainNames) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v2/domainnames") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3394,13 +3199,8 @@ func (m *awsRestjson1_serializeOpGetIntegration) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/integrations/{IntegrationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3466,13 +3266,8 @@ func (m *awsRestjson1_serializeOpGetIntegrationResponse) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/integrations/{IntegrationId}/integrationresponses/{IntegrationResponseId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3547,13 +3342,8 @@ func (m *awsRestjson1_serializeOpGetIntegrationResponses) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/integrations/{IntegrationId}/integrationresponses") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3627,13 +3417,8 @@ func (m *awsRestjson1_serializeOpGetIntegrations) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/integrations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3698,13 +3483,8 @@ func (m *awsRestjson1_serializeOpGetModel) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/models/{ModelId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3770,13 +3550,8 @@ func (m *awsRestjson1_serializeOpGetModels) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/models") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3841,13 +3616,8 @@ func (m *awsRestjson1_serializeOpGetModelTemplate) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/models/{ModelId}/template") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3913,13 +3683,8 @@ func (m *awsRestjson1_serializeOpGetRoute) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/routes/{RouteId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3985,13 +3750,8 @@ func (m *awsRestjson1_serializeOpGetRouteResponse) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/routes/{RouteId}/routeresponses/{RouteResponseId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4066,13 +3826,8 @@ func (m *awsRestjson1_serializeOpGetRouteResponses) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/routes/{RouteId}/routeresponses") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4146,13 +3901,8 @@ func (m *awsRestjson1_serializeOpGetRoutes) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/routes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4217,13 +3967,8 @@ func (m *awsRestjson1_serializeOpGetStage) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/stages/{StageName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4289,13 +4034,8 @@ func (m *awsRestjson1_serializeOpGetStages) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/stages") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4360,13 +4100,8 @@ func (m *awsRestjson1_serializeOpGetTags) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/v2/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4423,13 +4158,8 @@ func (m *awsRestjson1_serializeOpGetVpcLink) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v2/vpclinks/{VpcLinkId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4486,13 +4216,8 @@ func (m *awsRestjson1_serializeOpGetVpcLinks) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v2/vpclinks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4548,13 +4273,8 @@ func (m *awsRestjson1_serializeOpImportApi) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v2/apis") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4633,13 +4353,8 @@ func (m *awsRestjson1_serializeOpReimportApi) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4727,13 +4442,8 @@ func (m *awsRestjson1_serializeOpResetAuthorizersCache) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/stages/{StageName}/cache/authorizers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4799,13 +4509,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v2/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4887,13 +4592,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v2/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4956,13 +4656,8 @@ func (m *awsRestjson1_serializeOpUpdateApi) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5094,13 +4789,8 @@ func (m *awsRestjson1_serializeOpUpdateApiMapping) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/domainnames/{DomainName}/apimappings/{ApiMappingId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5199,13 +4889,8 @@ func (m *awsRestjson1_serializeOpUpdateAuthorizer) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/authorizers/{AuthorizerId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5343,13 +5028,8 @@ func (m *awsRestjson1_serializeOpUpdateDeployment) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/deployments/{DeploymentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5438,13 +5118,8 @@ func (m *awsRestjson1_serializeOpUpdateDomainName) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/domainnames/{DomainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5533,13 +5208,8 @@ func (m *awsRestjson1_serializeOpUpdateIntegration) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/integrations/{IntegrationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5716,13 +5386,8 @@ func (m *awsRestjson1_serializeOpUpdateIntegrationResponse) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/integrations/{IntegrationId}/integrationresponses/{IntegrationResponseId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5844,13 +5509,8 @@ func (m *awsRestjson1_serializeOpUpdateModel) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/models/{ModelId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5954,13 +5614,8 @@ func (m *awsRestjson1_serializeOpUpdateRoute) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/routes/{RouteId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6105,13 +5760,8 @@ func (m *awsRestjson1_serializeOpUpdateRouteResponse) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/routes/{RouteId}/routeresponses/{RouteResponseId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6228,13 +5878,8 @@ func (m *awsRestjson1_serializeOpUpdateStage) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v2/apis/{ApiId}/stages/{StageName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6366,13 +6011,8 @@ func (m *awsRestjson1_serializeOpUpdateVpcLink) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v2/vpclinks/{VpcLinkId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/appconfig/go.mod b/service/appconfig/go.mod index ad5b44ee833..c8fab9640cc 100644 --- a/service/appconfig/go.mod +++ b/service/appconfig/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appconfig/go.sum b/service/appconfig/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/appconfig/go.sum +++ b/service/appconfig/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/appconfig/serializers.go b/service/appconfig/serializers.go index 9ec28375327..132fc277d72 100644 --- a/service/appconfig/serializers.go +++ b/service/appconfig/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateApplication) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -121,13 +116,8 @@ func (m *awsRestjson1_serializeOpCreateConfigurationProfile) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/configurationprofiles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -236,13 +226,8 @@ func (m *awsRestjson1_serializeOpCreateDeploymentStrategy) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/deploymentstrategies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -346,13 +331,8 @@ func (m *awsRestjson1_serializeOpCreateEnvironment) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/environments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -451,13 +431,8 @@ func (m *awsRestjson1_serializeOpCreateHostedConfigurationVersion) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/configurationprofiles/{ConfigurationProfileId}/hostedconfigurationversions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -549,13 +524,8 @@ func (m *awsRestjson1_serializeOpDeleteApplication) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -612,13 +582,8 @@ func (m *awsRestjson1_serializeOpDeleteConfigurationProfile) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/configurationprofiles/{ConfigurationProfileId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -684,13 +649,8 @@ func (m *awsRestjson1_serializeOpDeleteDeploymentStrategy) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/deployementstrategies/{DeploymentStrategyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -747,13 +707,8 @@ func (m *awsRestjson1_serializeOpDeleteEnvironment) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/environments/{EnvironmentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -819,13 +774,8 @@ func (m *awsRestjson1_serializeOpDeleteHostedConfigurationVersion) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/configurationprofiles/{ConfigurationProfileId}/hostedconfigurationversions/{VersionNumber}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -897,13 +847,8 @@ func (m *awsRestjson1_serializeOpGetApplication) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -960,13 +905,8 @@ func (m *awsRestjson1_serializeOpGetConfiguration) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/applications/{Application}/environments/{Environment}/configurations/{Configuration}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1049,13 +989,8 @@ func (m *awsRestjson1_serializeOpGetConfigurationProfile) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/configurationprofiles/{ConfigurationProfileId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1121,13 +1056,8 @@ func (m *awsRestjson1_serializeOpGetDeployment) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/environments/{EnvironmentId}/deployments/{DeploymentNumber}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1199,13 +1129,8 @@ func (m *awsRestjson1_serializeOpGetDeploymentStrategy) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/deploymentstrategies/{DeploymentStrategyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1262,13 +1187,8 @@ func (m *awsRestjson1_serializeOpGetEnvironment) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/environments/{EnvironmentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1334,13 +1254,8 @@ func (m *awsRestjson1_serializeOpGetHostedConfigurationVersion) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/configurationprofiles/{ConfigurationProfileId}/hostedconfigurationversions/{VersionNumber}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1412,13 +1327,8 @@ func (m *awsRestjson1_serializeOpListApplications) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/applications") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1474,13 +1384,8 @@ func (m *awsRestjson1_serializeOpListConfigurationProfiles) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/configurationprofiles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1545,13 +1450,8 @@ func (m *awsRestjson1_serializeOpListDeployments) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/environments/{EnvironmentId}/deployments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1625,13 +1525,8 @@ func (m *awsRestjson1_serializeOpListDeploymentStrategies) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/deploymentstrategies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1687,13 +1582,8 @@ func (m *awsRestjson1_serializeOpListEnvironments) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/environments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1758,13 +1648,8 @@ func (m *awsRestjson1_serializeOpListHostedConfigurationVersions) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/configurationprofiles/{ConfigurationProfileId}/hostedconfigurationversions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1838,13 +1723,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1901,13 +1781,8 @@ func (m *awsRestjson1_serializeOpStartDeployment) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/environments/{EnvironmentId}/deployments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2018,13 +1893,8 @@ func (m *awsRestjson1_serializeOpStopDeployment) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/environments/{EnvironmentId}/deployments/{DeploymentNumber}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2096,13 +1966,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2184,13 +2049,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2253,13 +2113,8 @@ func (m *awsRestjson1_serializeOpUpdateApplication) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2344,13 +2199,8 @@ func (m *awsRestjson1_serializeOpUpdateConfigurationProfile) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/configurationprofiles/{ConfigurationProfileId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2456,13 +2306,8 @@ func (m *awsRestjson1_serializeOpUpdateDeploymentStrategy) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/deploymentstrategies/{DeploymentStrategyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2562,13 +2407,8 @@ func (m *awsRestjson1_serializeOpUpdateEnvironment) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/environments/{EnvironmentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2669,13 +2509,8 @@ func (m *awsRestjson1_serializeOpValidateConfiguration) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/configurationprofiles/{ConfigurationProfileId}/validators") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/appflow/go.mod b/service/appflow/go.mod index 6eb0c3a1a10..4a2b1f35ac5 100644 --- a/service/appflow/go.mod +++ b/service/appflow/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appflow/go.sum b/service/appflow/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/appflow/go.sum +++ b/service/appflow/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/appflow/serializers.go b/service/appflow/serializers.go index 4785b569124..7c6b81fb524 100644 --- a/service/appflow/serializers.go +++ b/service/appflow/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpCreateConnectorProfile) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/create-connector-profile") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -132,13 +127,8 @@ func (m *awsRestjson1_serializeOpCreateFlow) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/create-flow") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -250,13 +240,8 @@ func (m *awsRestjson1_serializeOpDeleteConnectorProfile) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/delete-connector-profile") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -328,13 +313,8 @@ func (m *awsRestjson1_serializeOpDeleteFlow) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/delete-flow") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -406,13 +386,8 @@ func (m *awsRestjson1_serializeOpDescribeConnectorEntity) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/describe-connector-entity") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -489,13 +464,8 @@ func (m *awsRestjson1_serializeOpDescribeConnectorProfiles) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/describe-connector-profiles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -579,13 +549,8 @@ func (m *awsRestjson1_serializeOpDescribeConnectors) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/describe-connectors") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -659,13 +624,8 @@ func (m *awsRestjson1_serializeOpDescribeFlow) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/describe-flow") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -732,13 +692,8 @@ func (m *awsRestjson1_serializeOpDescribeFlowExecutionRecords) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/describe-flow-execution-records") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -815,13 +770,8 @@ func (m *awsRestjson1_serializeOpListConnectorEntities) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/list-connector-entities") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -898,13 +848,8 @@ func (m *awsRestjson1_serializeOpListFlows) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/list-flows") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -976,13 +921,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1039,13 +979,8 @@ func (m *awsRestjson1_serializeOpStartFlow) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/start-flow") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1112,13 +1047,8 @@ func (m *awsRestjson1_serializeOpStopFlow) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/stop-flow") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1185,13 +1115,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1273,13 +1198,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1342,13 +1262,8 @@ func (m *awsRestjson1_serializeOpUpdateConnectorProfile) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/update-connector-profile") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1427,13 +1342,8 @@ func (m *awsRestjson1_serializeOpUpdateFlow) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/update-flow") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/appintegrations/go.mod b/service/appintegrations/go.mod index a83b2c4e7c9..25abaf2e00b 100644 --- a/service/appintegrations/go.mod +++ b/service/appintegrations/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appintegrations/go.sum b/service/appintegrations/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/appintegrations/go.sum +++ b/service/appintegrations/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/appintegrations/serializers.go b/service/appintegrations/serializers.go index 58b20ade8dd..93eeab52c50 100644 --- a/service/appintegrations/serializers.go +++ b/service/appintegrations/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateEventIntegration) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/eventIntegrations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -138,13 +133,8 @@ func (m *awsRestjson1_serializeOpDeleteEventIntegration) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/eventIntegrations/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -201,13 +191,8 @@ func (m *awsRestjson1_serializeOpGetEventIntegration) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/eventIntegrations/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -264,13 +249,8 @@ func (m *awsRestjson1_serializeOpListEventIntegrationAssociations) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/eventIntegrations/{EventIntegrationName}/associations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -335,13 +315,8 @@ func (m *awsRestjson1_serializeOpListEventIntegrations) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/eventIntegrations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -397,13 +372,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -460,13 +430,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -548,13 +513,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -617,13 +577,8 @@ func (m *awsRestjson1_serializeOpUpdateEventIntegration) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/eventIntegrations/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/appmesh/go.mod b/service/appmesh/go.mod index 467927e8082..09a7027b8f2 100644 --- a/service/appmesh/go.mod +++ b/service/appmesh/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appmesh/go.sum b/service/appmesh/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/appmesh/go.sum +++ b/service/appmesh/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/appmesh/serializers.go b/service/appmesh/serializers.go index 31733e82640..831f9422068 100644 --- a/service/appmesh/serializers.go +++ b/service/appmesh/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateGatewayRoute) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualGateway/{virtualGatewayName}/gatewayRoutes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -154,13 +149,8 @@ func (m *awsRestjson1_serializeOpCreateMesh) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -246,13 +236,8 @@ func (m *awsRestjson1_serializeOpCreateRoute) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualRouter/{virtualRouterName}/routes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -364,13 +349,8 @@ func (m *awsRestjson1_serializeOpCreateVirtualGateway) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualGateways") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -473,13 +453,8 @@ func (m *awsRestjson1_serializeOpCreateVirtualNode) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualNodes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -582,13 +557,8 @@ func (m *awsRestjson1_serializeOpCreateVirtualRouter) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualRouters") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -691,13 +661,8 @@ func (m *awsRestjson1_serializeOpCreateVirtualService) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualServices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -800,13 +765,8 @@ func (m *awsRestjson1_serializeOpDeleteGatewayRoute) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualGateway/{virtualGatewayName}/gatewayRoutes/{gatewayRouteName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -885,13 +845,8 @@ func (m *awsRestjson1_serializeOpDeleteMesh) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -948,13 +903,8 @@ func (m *awsRestjson1_serializeOpDeleteRoute) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualRouter/{virtualRouterName}/routes/{routeName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1033,13 +983,8 @@ func (m *awsRestjson1_serializeOpDeleteVirtualGateway) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualGateways/{virtualGatewayName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1109,13 +1054,8 @@ func (m *awsRestjson1_serializeOpDeleteVirtualNode) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualNodes/{virtualNodeName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1185,13 +1125,8 @@ func (m *awsRestjson1_serializeOpDeleteVirtualRouter) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualRouters/{virtualRouterName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1261,13 +1196,8 @@ func (m *awsRestjson1_serializeOpDeleteVirtualService) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualServices/{virtualServiceName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1337,13 +1267,8 @@ func (m *awsRestjson1_serializeOpDescribeGatewayRoute) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualGateway/{virtualGatewayName}/gatewayRoutes/{gatewayRouteName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1422,13 +1347,8 @@ func (m *awsRestjson1_serializeOpDescribeMesh) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1489,13 +1409,8 @@ func (m *awsRestjson1_serializeOpDescribeRoute) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualRouter/{virtualRouterName}/routes/{routeName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1574,13 +1489,8 @@ func (m *awsRestjson1_serializeOpDescribeVirtualGateway) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualGateways/{virtualGatewayName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1650,13 +1560,8 @@ func (m *awsRestjson1_serializeOpDescribeVirtualNode) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualNodes/{virtualNodeName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1726,13 +1631,8 @@ func (m *awsRestjson1_serializeOpDescribeVirtualRouter) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualRouters/{virtualRouterName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1802,13 +1702,8 @@ func (m *awsRestjson1_serializeOpDescribeVirtualService) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualServices/{virtualServiceName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1878,13 +1773,8 @@ func (m *awsRestjson1_serializeOpListGatewayRoutes) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualGateway/{virtualGatewayName}/gatewayRoutes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1962,13 +1852,8 @@ func (m *awsRestjson1_serializeOpListMeshes) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2024,13 +1909,8 @@ func (m *awsRestjson1_serializeOpListRoutes) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualRouter/{virtualRouterName}/routes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2108,13 +1988,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v20190125/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2174,13 +2049,8 @@ func (m *awsRestjson1_serializeOpListVirtualGateways) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualGateways") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2249,13 +2119,8 @@ func (m *awsRestjson1_serializeOpListVirtualNodes) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualNodes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2324,13 +2189,8 @@ func (m *awsRestjson1_serializeOpListVirtualRouters) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualRouters") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2399,13 +2259,8 @@ func (m *awsRestjson1_serializeOpListVirtualServices) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualServices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2474,13 +2329,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v20190125/tag") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2557,13 +2407,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v20190125/untag") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2640,13 +2485,8 @@ func (m *awsRestjson1_serializeOpUpdateGatewayRoute) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualGateway/{virtualGatewayName}/gatewayRoutes/{gatewayRouteName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2755,13 +2595,8 @@ func (m *awsRestjson1_serializeOpUpdateMesh) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2848,13 +2683,8 @@ func (m *awsRestjson1_serializeOpUpdateRoute) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualRouter/{virtualRouterName}/routes/{routeName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2963,13 +2793,8 @@ func (m *awsRestjson1_serializeOpUpdateVirtualGateway) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualGateways/{virtualGatewayName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3069,13 +2894,8 @@ func (m *awsRestjson1_serializeOpUpdateVirtualNode) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualNodes/{virtualNodeName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3175,13 +2995,8 @@ func (m *awsRestjson1_serializeOpUpdateVirtualRouter) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualRouters/{virtualRouterName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3281,13 +3096,8 @@ func (m *awsRestjson1_serializeOpUpdateVirtualService) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v20190125/meshes/{meshName}/virtualServices/{virtualServiceName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/appsync/go.mod b/service/appsync/go.mod index c833bb01b04..b169e93dd5b 100644 --- a/service/appsync/go.mod +++ b/service/appsync/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/appsync/go.sum b/service/appsync/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/appsync/go.sum +++ b/service/appsync/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/appsync/serializers.go b/service/appsync/serializers.go index 57aa5adbcec..96cb94bc9c0 100644 --- a/service/appsync/serializers.go +++ b/service/appsync/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateApiCache) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/ApiCaches") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -142,13 +137,8 @@ func (m *awsRestjson1_serializeOpCreateApiKey) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/apikeys") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -233,13 +223,8 @@ func (m *awsRestjson1_serializeOpCreateDataSource) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/datasources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -369,13 +354,8 @@ func (m *awsRestjson1_serializeOpCreateFunction) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/functions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -487,13 +467,8 @@ func (m *awsRestjson1_serializeOpCreateGraphqlApi) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/apis") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -605,13 +580,8 @@ func (m *awsRestjson1_serializeOpCreateResolver) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/types/{typeName}/resolvers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -741,13 +711,8 @@ func (m *awsRestjson1_serializeOpCreateType) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/types") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -832,13 +797,8 @@ func (m *awsRestjson1_serializeOpDeleteApiCache) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/ApiCaches") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -895,13 +855,8 @@ func (m *awsRestjson1_serializeOpDeleteApiKey) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/apikeys/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -967,13 +922,8 @@ func (m *awsRestjson1_serializeOpDeleteDataSource) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/datasources/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1039,13 +989,8 @@ func (m *awsRestjson1_serializeOpDeleteFunction) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/functions/{functionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1111,13 +1056,8 @@ func (m *awsRestjson1_serializeOpDeleteGraphqlApi) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1174,13 +1114,8 @@ func (m *awsRestjson1_serializeOpDeleteResolver) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/types/{typeName}/resolvers/{fieldName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1255,13 +1190,8 @@ func (m *awsRestjson1_serializeOpDeleteType) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/types/{typeName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1327,13 +1257,8 @@ func (m *awsRestjson1_serializeOpFlushApiCache) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/FlushCache") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1390,13 +1315,8 @@ func (m *awsRestjson1_serializeOpGetApiCache) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/ApiCaches") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1453,13 +1373,8 @@ func (m *awsRestjson1_serializeOpGetDataSource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/datasources/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1525,13 +1440,8 @@ func (m *awsRestjson1_serializeOpGetFunction) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/functions/{functionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1597,13 +1507,8 @@ func (m *awsRestjson1_serializeOpGetGraphqlApi) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1660,13 +1565,8 @@ func (m *awsRestjson1_serializeOpGetIntrospectionSchema) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/schema") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1731,13 +1631,8 @@ func (m *awsRestjson1_serializeOpGetResolver) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/types/{typeName}/resolvers/{fieldName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1812,13 +1707,8 @@ func (m *awsRestjson1_serializeOpGetSchemaCreationStatus) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/schemacreation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1875,13 +1765,8 @@ func (m *awsRestjson1_serializeOpGetType) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/types/{typeName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1951,13 +1836,8 @@ func (m *awsRestjson1_serializeOpListApiKeys) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/apikeys") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2022,13 +1902,8 @@ func (m *awsRestjson1_serializeOpListDataSources) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/datasources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2093,13 +1968,8 @@ func (m *awsRestjson1_serializeOpListFunctions) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/functions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2164,13 +2034,8 @@ func (m *awsRestjson1_serializeOpListGraphqlApis) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v1/apis") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2226,13 +2091,8 @@ func (m *awsRestjson1_serializeOpListResolvers) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/types/{typeName}/resolvers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2306,13 +2166,8 @@ func (m *awsRestjson1_serializeOpListResolversByFunction) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/functions/{functionId}/resolvers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2386,13 +2241,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2449,13 +2299,8 @@ func (m *awsRestjson1_serializeOpListTypes) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/types") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2524,13 +2369,8 @@ func (m *awsRestjson1_serializeOpStartSchemaCreation) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/schemacreation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2610,13 +2450,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2698,13 +2533,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2767,13 +2597,8 @@ func (m *awsRestjson1_serializeOpUpdateApiCache) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/ApiCaches/update") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2863,13 +2688,8 @@ func (m *awsRestjson1_serializeOpUpdateApiKey) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/apikeys/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2963,13 +2783,8 @@ func (m *awsRestjson1_serializeOpUpdateDataSource) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/datasources/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3103,13 +2918,8 @@ func (m *awsRestjson1_serializeOpUpdateFunction) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/functions/{functionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3230,13 +3040,8 @@ func (m *awsRestjson1_serializeOpUpdateGraphqlApi) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3354,13 +3159,8 @@ func (m *awsRestjson1_serializeOpUpdateResolver) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/types/{typeName}/resolvers/{fieldName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3494,13 +3294,8 @@ func (m *awsRestjson1_serializeOpUpdateType) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/apis/{apiId}/types/{typeName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/auditmanager/go.mod b/service/auditmanager/go.mod index 0d0e88b55db..e3344f9c033 100644 --- a/service/auditmanager/go.mod +++ b/service/auditmanager/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/auditmanager/go.sum b/service/auditmanager/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/auditmanager/go.sum +++ b/service/auditmanager/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/auditmanager/serializers.go b/service/auditmanager/serializers.go index 8da7a7a7551..fb8c74fb404 100644 --- a/service/auditmanager/serializers.go +++ b/service/auditmanager/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAssociateAssessmentReportEvidenceFolder) Handle } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/associateToAssessmentReport") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -122,13 +117,8 @@ func (m *awsRestjson1_serializeOpBatchAssociateAssessmentReportEvidence) HandleS } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/batchAssociateToAssessmentReport") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -215,13 +205,8 @@ func (m *awsRestjson1_serializeOpBatchCreateDelegationByAssessment) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/delegations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -303,13 +288,8 @@ func (m *awsRestjson1_serializeOpBatchDeleteDelegationByAssessment) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/delegations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -391,13 +371,8 @@ func (m *awsRestjson1_serializeOpBatchDisassociateAssessmentReportEvidence) Hand } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/batchDisassociateFromAssessmentReport") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -484,13 +459,8 @@ func (m *awsRestjson1_serializeOpBatchImportEvidenceToAssessmentControl) HandleS } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/controlSets/{controlSetId}/controls/{controlId}/evidence") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -590,13 +560,8 @@ func (m *awsRestjson1_serializeOpCreateAssessment) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/assessments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -701,13 +666,8 @@ func (m *awsRestjson1_serializeOpCreateAssessmentFramework) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/assessmentFrameworks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -798,13 +758,8 @@ func (m *awsRestjson1_serializeOpCreateAssessmentReport) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/reports") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -889,13 +844,8 @@ func (m *awsRestjson1_serializeOpCreateControl) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/controls") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -996,13 +946,8 @@ func (m *awsRestjson1_serializeOpDeleteAssessment) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1059,13 +1004,8 @@ func (m *awsRestjson1_serializeOpDeleteAssessmentFramework) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/assessmentFrameworks/{frameworkId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1122,13 +1062,8 @@ func (m *awsRestjson1_serializeOpDeleteAssessmentReport) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/reports/{assessmentReportId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1194,13 +1129,8 @@ func (m *awsRestjson1_serializeOpDeleteControl) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/controls/{controlId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1257,13 +1187,8 @@ func (m *awsRestjson1_serializeOpDeregisterAccount) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/account/deregisterAccount") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1307,13 +1232,8 @@ func (m *awsRestjson1_serializeOpDeregisterOrganizationAdminAccount) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/account/deregisterOrganizationAdminAccount") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1380,13 +1300,8 @@ func (m *awsRestjson1_serializeOpDisassociateAssessmentReportEvidenceFolder) Han } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/disassociateFromAssessmentReport") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1466,13 +1381,8 @@ func (m *awsRestjson1_serializeOpGetAccountStatus) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/account/status") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1516,13 +1426,8 @@ func (m *awsRestjson1_serializeOpGetAssessment) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1579,13 +1484,8 @@ func (m *awsRestjson1_serializeOpGetAssessmentFramework) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/assessmentFrameworks/{frameworkId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1642,13 +1542,8 @@ func (m *awsRestjson1_serializeOpGetAssessmentReportUrl) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/reports/{assessmentReportId}/url") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1714,13 +1609,8 @@ func (m *awsRestjson1_serializeOpGetChangeLogs) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/changelogs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1793,13 +1683,8 @@ func (m *awsRestjson1_serializeOpGetControl) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/controls/{controlId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1856,13 +1741,8 @@ func (m *awsRestjson1_serializeOpGetDelegations) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/delegations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1918,13 +1798,8 @@ func (m *awsRestjson1_serializeOpGetEvidence) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/controlSets/{controlSetId}/evidenceFolders/{evidenceFolderId}/evidence/{evidenceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2008,13 +1883,8 @@ func (m *awsRestjson1_serializeOpGetEvidenceByEvidenceFolder) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/controlSets/{controlSetId}/evidenceFolders/{evidenceFolderId}/evidence") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2097,13 +1967,8 @@ func (m *awsRestjson1_serializeOpGetEvidenceFolder) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/controlSets/{controlSetId}/evidenceFolders/{evidenceFolderId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2178,13 +2043,8 @@ func (m *awsRestjson1_serializeOpGetEvidenceFoldersByAssessment) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/evidenceFolders") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2249,13 +2109,8 @@ func (m *awsRestjson1_serializeOpGetEvidenceFoldersByAssessmentControl) HandleSe } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/evidenceFolders-by-assessment-control/{controlSetId}/{controlId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2338,13 +2193,8 @@ func (m *awsRestjson1_serializeOpGetOrganizationAdminAccount) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/account/organizationAdminAccount") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2388,13 +2238,8 @@ func (m *awsRestjson1_serializeOpGetServicesInScope) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/services") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2438,13 +2283,8 @@ func (m *awsRestjson1_serializeOpGetSettings) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/settings/{attribute}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2501,13 +2341,8 @@ func (m *awsRestjson1_serializeOpListAssessmentFrameworks) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/assessmentFrameworks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2567,13 +2402,8 @@ func (m *awsRestjson1_serializeOpListAssessmentReports) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/assessmentReports") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2629,13 +2459,8 @@ func (m *awsRestjson1_serializeOpListAssessments) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/assessments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2691,13 +2516,8 @@ func (m *awsRestjson1_serializeOpListControls) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/controls") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2757,13 +2577,8 @@ func (m *awsRestjson1_serializeOpListKeywordsForDataSource) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/dataSourceKeywords") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2823,13 +2638,8 @@ func (m *awsRestjson1_serializeOpListNotifications) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/notifications") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2885,13 +2695,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2948,13 +2753,8 @@ func (m *awsRestjson1_serializeOpRegisterAccount) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/account/registerAccount") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3026,13 +2826,8 @@ func (m *awsRestjson1_serializeOpRegisterOrganizationAdminAccount) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/account/registerOrganizationAdminAccount") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3099,13 +2894,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3187,13 +2977,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3256,13 +3041,8 @@ func (m *awsRestjson1_serializeOpUpdateAssessment) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3368,13 +3148,8 @@ func (m *awsRestjson1_serializeOpUpdateAssessmentControl) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/controlSets/{controlSetId}/controls/{controlId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3477,13 +3252,8 @@ func (m *awsRestjson1_serializeOpUpdateAssessmentControlSetStatus) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/controlSets/{controlSetId}/status") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3577,13 +3347,8 @@ func (m *awsRestjson1_serializeOpUpdateAssessmentFramework) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/assessmentFrameworks/{frameworkId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3680,13 +3445,8 @@ func (m *awsRestjson1_serializeOpUpdateAssessmentStatus) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/assessments/{assessmentId}/status") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3766,13 +3526,8 @@ func (m *awsRestjson1_serializeOpUpdateControl) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/controls/{controlId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3879,13 +3634,8 @@ func (m *awsRestjson1_serializeOpUpdateSettings) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3971,13 +3721,8 @@ func (m *awsRestjson1_serializeOpValidateAssessmentReportIntegrity) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/assessmentReports/integrity") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/backup/go.mod b/service/backup/go.mod index 878cc12f9a4..7911b6e8c84 100644 --- a/service/backup/go.mod +++ b/service/backup/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/backup/go.sum b/service/backup/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/backup/go.sum +++ b/service/backup/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/backup/serializers.go b/service/backup/serializers.go index 3eda147fe2a..cf9da97a6dc 100644 --- a/service/backup/serializers.go +++ b/service/backup/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpCreateBackupPlan) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/backup/plans") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -124,13 +119,8 @@ func (m *awsRestjson1_serializeOpCreateBackupSelection) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/backup/plans/{BackupPlanId}/selections") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -217,13 +207,8 @@ func (m *awsRestjson1_serializeOpCreateBackupVault) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/backup-vaults/{BackupVaultName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -315,13 +300,8 @@ func (m *awsRestjson1_serializeOpDeleteBackupPlan) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/backup/plans/{BackupPlanId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -378,13 +358,8 @@ func (m *awsRestjson1_serializeOpDeleteBackupSelection) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/backup/plans/{BackupPlanId}/selections/{SelectionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -450,13 +425,8 @@ func (m *awsRestjson1_serializeOpDeleteBackupVault) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/backup-vaults/{BackupVaultName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -513,13 +483,8 @@ func (m *awsRestjson1_serializeOpDeleteBackupVaultAccessPolicy) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/backup-vaults/{BackupVaultName}/access-policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -576,13 +541,8 @@ func (m *awsRestjson1_serializeOpDeleteBackupVaultNotifications) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/backup-vaults/{BackupVaultName}/notification-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -639,13 +599,8 @@ func (m *awsRestjson1_serializeOpDeleteRecoveryPoint) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/backup-vaults/{BackupVaultName}/recovery-points/{RecoveryPointArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -711,13 +666,8 @@ func (m *awsRestjson1_serializeOpDescribeBackupJob) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/backup-jobs/{BackupJobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -774,13 +724,8 @@ func (m *awsRestjson1_serializeOpDescribeBackupVault) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/backup-vaults/{BackupVaultName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -837,13 +782,8 @@ func (m *awsRestjson1_serializeOpDescribeCopyJob) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/copy-jobs/{CopyJobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -900,13 +840,8 @@ func (m *awsRestjson1_serializeOpDescribeGlobalSettings) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/global-settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -950,13 +885,8 @@ func (m *awsRestjson1_serializeOpDescribeProtectedResource) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/resources/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1013,13 +943,8 @@ func (m *awsRestjson1_serializeOpDescribeRecoveryPoint) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/backup-vaults/{BackupVaultName}/recovery-points/{RecoveryPointArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1085,13 +1010,8 @@ func (m *awsRestjson1_serializeOpDescribeRegionSettings) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/account-settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1135,13 +1055,8 @@ func (m *awsRestjson1_serializeOpDescribeRestoreJob) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/restore-jobs/{RestoreJobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1198,13 +1113,8 @@ func (m *awsRestjson1_serializeOpDisassociateRecoveryPoint) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/backup-vaults/{BackupVaultName}/recovery-points/{RecoveryPointArn}/disassociate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1270,13 +1180,8 @@ func (m *awsRestjson1_serializeOpExportBackupPlanTemplate) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/backup/plans/{BackupPlanId}/toTemplate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1333,13 +1238,8 @@ func (m *awsRestjson1_serializeOpGetBackupPlan) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/backup/plans/{BackupPlanId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1400,13 +1300,8 @@ func (m *awsRestjson1_serializeOpGetBackupPlanFromJSON) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/backup/template/json/toPlan") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1473,13 +1368,8 @@ func (m *awsRestjson1_serializeOpGetBackupPlanFromTemplate) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/backup/template/plans/{BackupPlanTemplateId}/toPlan") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1536,13 +1426,8 @@ func (m *awsRestjson1_serializeOpGetBackupSelection) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/backup/plans/{BackupPlanId}/selections/{SelectionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1608,13 +1493,8 @@ func (m *awsRestjson1_serializeOpGetBackupVaultAccessPolicy) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/backup-vaults/{BackupVaultName}/access-policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1671,13 +1551,8 @@ func (m *awsRestjson1_serializeOpGetBackupVaultNotifications) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/backup-vaults/{BackupVaultName}/notification-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1734,13 +1609,8 @@ func (m *awsRestjson1_serializeOpGetRecoveryPointRestoreMetadata) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/backup-vaults/{BackupVaultName}/recovery-points/{RecoveryPointArn}/restore-metadata") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1806,13 +1676,8 @@ func (m *awsRestjson1_serializeOpGetSupportedResourceTypes) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/supported-resource-types") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1856,13 +1721,8 @@ func (m *awsRestjson1_serializeOpListBackupJobs) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/backup-jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1946,13 +1806,8 @@ func (m *awsRestjson1_serializeOpListBackupPlans) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/backup/plans") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2012,13 +1867,8 @@ func (m *awsRestjson1_serializeOpListBackupPlanTemplates) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/backup/template/plans") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2074,13 +1924,8 @@ func (m *awsRestjson1_serializeOpListBackupPlanVersions) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/backup/plans/{BackupPlanId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2145,13 +1990,8 @@ func (m *awsRestjson1_serializeOpListBackupSelections) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/backup/plans/{BackupPlanId}/selections") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2216,13 +2056,8 @@ func (m *awsRestjson1_serializeOpListBackupVaults) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/backup-vaults") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2278,13 +2113,8 @@ func (m *awsRestjson1_serializeOpListCopyJobs) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/copy-jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2368,13 +2198,8 @@ func (m *awsRestjson1_serializeOpListProtectedResources) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/resources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2430,13 +2255,8 @@ func (m *awsRestjson1_serializeOpListRecoveryPointsByBackupVault) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/backup-vaults/{BackupVaultName}/recovery-points") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2521,13 +2341,8 @@ func (m *awsRestjson1_serializeOpListRecoveryPointsByResource) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/resources/{ResourceArn}/recovery-points") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2592,13 +2407,8 @@ func (m *awsRestjson1_serializeOpListRestoreJobs) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/restore-jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2670,13 +2480,8 @@ func (m *awsRestjson1_serializeOpListTags) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2741,13 +2546,8 @@ func (m *awsRestjson1_serializeOpPutBackupVaultAccessPolicy) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/backup-vaults/{BackupVaultName}/access-policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2827,13 +2627,8 @@ func (m *awsRestjson1_serializeOpPutBackupVaultNotifications) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/backup-vaults/{BackupVaultName}/notification-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2920,13 +2715,8 @@ func (m *awsRestjson1_serializeOpStartBackupJob) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/backup-jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3039,13 +2829,8 @@ func (m *awsRestjson1_serializeOpStartCopyJob) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/copy-jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3139,13 +2924,8 @@ func (m *awsRestjson1_serializeOpStartRestoreJob) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/restore-jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3234,13 +3014,8 @@ func (m *awsRestjson1_serializeOpStopBackupJob) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/backup-jobs/{BackupJobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3297,13 +3072,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3385,13 +3155,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/untag/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3473,13 +3238,8 @@ func (m *awsRestjson1_serializeOpUpdateBackupPlan) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/backup/plans/{BackupPlanId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3561,13 +3321,8 @@ func (m *awsRestjson1_serializeOpUpdateGlobalSettings) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/global-settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3636,13 +3391,8 @@ func (m *awsRestjson1_serializeOpUpdateRecoveryPointLifecycle) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/backup-vaults/{BackupVaultName}/recovery-points/{RecoveryPointArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3733,13 +3483,8 @@ func (m *awsRestjson1_serializeOpUpdateRegionSettings) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/account-settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/batch/go.mod b/service/batch/go.mod index 6b310b7fc4a..b783913558e 100644 --- a/service/batch/go.mod +++ b/service/batch/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/batch/go.sum b/service/batch/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/batch/go.sum +++ b/service/batch/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/batch/serializers.go b/service/batch/serializers.go index 48e1ac3256e..4982d81c2bc 100644 --- a/service/batch/serializers.go +++ b/service/batch/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCancelJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/canceljob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -114,13 +109,8 @@ func (m *awsRestjson1_serializeOpCreateComputeEnvironment) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/v1/createcomputeenvironment") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -216,13 +206,8 @@ func (m *awsRestjson1_serializeOpCreateJobQueue) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/createjobqueue") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -313,13 +298,8 @@ func (m *awsRestjson1_serializeOpDeleteComputeEnvironment) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/v1/deletecomputeenvironment") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -386,13 +366,8 @@ func (m *awsRestjson1_serializeOpDeleteJobQueue) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/deletejobqueue") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -459,13 +434,8 @@ func (m *awsRestjson1_serializeOpDeregisterJobDefinition) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/v1/deregisterjobdefinition") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -532,13 +502,8 @@ func (m *awsRestjson1_serializeOpDescribeComputeEnvironments) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/v1/describecomputeenvironments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -617,13 +582,8 @@ func (m *awsRestjson1_serializeOpDescribeJobDefinitions) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v1/describejobdefinitions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -712,13 +672,8 @@ func (m *awsRestjson1_serializeOpDescribeJobQueues) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v1/describejobqueues") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -797,13 +752,8 @@ func (m *awsRestjson1_serializeOpDescribeJobs) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/describejobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -872,13 +822,8 @@ func (m *awsRestjson1_serializeOpListJobs) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/listjobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -970,13 +915,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1033,13 +973,8 @@ func (m *awsRestjson1_serializeOpRegisterJobDefinition) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/registerjobdefinition") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1165,13 +1100,8 @@ func (m *awsRestjson1_serializeOpSubmitJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/submitjob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1309,13 +1239,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1397,13 +1322,8 @@ func (m *awsRestjson1_serializeOpTerminateJob) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/terminatejob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1475,13 +1395,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1544,13 +1459,8 @@ func (m *awsRestjson1_serializeOpUpdateComputeEnvironment) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/v1/updatecomputeenvironment") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1634,13 +1544,8 @@ func (m *awsRestjson1_serializeOpUpdateJobQueue) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/updatejobqueue") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/braket/go.mod b/service/braket/go.mod index 6ce4af19ca0..434e32e7e6c 100644 --- a/service/braket/go.mod +++ b/service/braket/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/braket/go.sum b/service/braket/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/braket/go.sum +++ b/service/braket/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/braket/serializers.go b/service/braket/serializers.go index bc1d4903fed..c00f83e5a56 100644 --- a/service/braket/serializers.go +++ b/service/braket/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCancelQuantumTask) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/quantum-task/{quantumTaskArn}/cancel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -122,13 +117,8 @@ func (m *awsRestjson1_serializeOpCreateQuantumTask) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/quantum-task") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -232,13 +222,8 @@ func (m *awsRestjson1_serializeOpGetDevice) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/device/{deviceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -295,13 +280,8 @@ func (m *awsRestjson1_serializeOpGetQuantumTask) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/quantum-task/{quantumTaskArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -358,13 +338,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -421,13 +396,8 @@ func (m *awsRestjson1_serializeOpSearchDevices) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/devices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -506,13 +476,8 @@ func (m *awsRestjson1_serializeOpSearchQuantumTasks) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/quantum-tasks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -591,13 +556,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -679,13 +639,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/chime/go.mod b/service/chime/go.mod index 99cec88ed41..0abf8da6a38 100644 --- a/service/chime/go.mod +++ b/service/chime/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/chime/go.sum b/service/chime/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/chime/go.sum +++ b/service/chime/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/chime/serializers.go b/service/chime/serializers.go index 81ebc4feaf1..196b278bd47 100644 --- a/service/chime/serializers.go +++ b/service/chime/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpAssociatePhoneNumbersWithVoiceConnector) Handle } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}?operation=associate-phone-numbers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -130,13 +125,8 @@ func (m *awsRestjson1_serializeOpAssociatePhoneNumbersWithVoiceConnectorGroup) H } opPath, opQuery := httpbinding.SplitURI("/voice-connector-groups/{VoiceConnectorGroupId}?operation=associate-phone-numbers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -223,13 +213,8 @@ func (m *awsRestjson1_serializeOpAssociatePhoneNumberWithUser) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/users/{UserId}?operation=associate-phone-number") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -318,13 +303,8 @@ func (m *awsRestjson1_serializeOpAssociateSigninDelegateGroupsWithAccount) Handl } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}?operation=associate-signin-delegate-groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -406,13 +386,8 @@ func (m *awsRestjson1_serializeOpBatchCreateAttendee) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/meetings/{MeetingId}/attendees?operation=batch-create") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -494,13 +469,8 @@ func (m *awsRestjson1_serializeOpBatchCreateRoomMembership) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/rooms/{RoomId}/memberships?operation=batch-create") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -591,13 +561,8 @@ func (m *awsRestjson1_serializeOpBatchDeletePhoneNumber) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/phone-numbers?operation=batch-delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -666,13 +631,8 @@ func (m *awsRestjson1_serializeOpBatchSuspendUser) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/users?operation=suspend") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -754,13 +714,8 @@ func (m *awsRestjson1_serializeOpBatchUnsuspendUser) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/users?operation=unsuspend") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -842,13 +797,8 @@ func (m *awsRestjson1_serializeOpBatchUpdatePhoneNumber) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/phone-numbers?operation=batch-update") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -917,13 +867,8 @@ func (m *awsRestjson1_serializeOpBatchUpdateUser) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/users") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1005,13 +950,8 @@ func (m *awsRestjson1_serializeOpCreateAccount) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/accounts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1078,13 +1018,8 @@ func (m *awsRestjson1_serializeOpCreateAppInstance) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/app-instances") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1168,13 +1103,8 @@ func (m *awsRestjson1_serializeOpCreateAppInstanceAdmin) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/app-instances/{AppInstanceArn}/admins") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1254,13 +1184,8 @@ func (m *awsRestjson1_serializeOpCreateAppInstanceUser) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/app-instance-users") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1354,13 +1279,8 @@ func (m *awsRestjson1_serializeOpCreateAttendee) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/meetings/{MeetingId}/attendees") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1447,13 +1367,8 @@ func (m *awsRestjson1_serializeOpCreateBot) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/bots") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1538,13 +1453,8 @@ func (m *awsRestjson1_serializeOpCreateChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/channels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1652,13 +1562,8 @@ func (m *awsRestjson1_serializeOpCreateChannelBan) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/bans") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1743,13 +1648,8 @@ func (m *awsRestjson1_serializeOpCreateChannelMembership) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/memberships") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1839,13 +1739,8 @@ func (m *awsRestjson1_serializeOpCreateChannelModerator) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/moderators") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1930,13 +1825,8 @@ func (m *awsRestjson1_serializeOpCreateMeeting) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/meetings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2032,13 +1922,8 @@ func (m *awsRestjson1_serializeOpCreateMeetingDialOut) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/meetings/{MeetingId}/dial-outs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2128,13 +2013,8 @@ func (m *awsRestjson1_serializeOpCreateMeetingWithAttendees) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/meetings?operation=create-attendees") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2237,13 +2117,8 @@ func (m *awsRestjson1_serializeOpCreatePhoneNumberOrder) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/phone-number-orders") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2317,13 +2192,8 @@ func (m *awsRestjson1_serializeOpCreateProxySession) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/proxy-sessions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2439,13 +2309,8 @@ func (m *awsRestjson1_serializeOpCreateRoom) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/rooms") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2530,13 +2395,8 @@ func (m *awsRestjson1_serializeOpCreateRoomMembership) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/rooms/{RoomId}/memberships") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2630,13 +2490,8 @@ func (m *awsRestjson1_serializeOpCreateSipMediaApplication) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/sip-media-applications") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2715,13 +2570,8 @@ func (m *awsRestjson1_serializeOpCreateSipMediaApplicationCall) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/sip-media-applications/{SipMediaApplicationId}/calls") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2806,13 +2656,8 @@ func (m *awsRestjson1_serializeOpCreateSipRule) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/sip-rules") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2901,13 +2746,8 @@ func (m *awsRestjson1_serializeOpCreateUser) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/users?operation=create") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2997,13 +2837,8 @@ func (m *awsRestjson1_serializeOpCreateVoiceConnector) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/voice-connectors") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3080,13 +2915,8 @@ func (m *awsRestjson1_serializeOpCreateVoiceConnectorGroup) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/voice-connector-groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3160,13 +2990,8 @@ func (m *awsRestjson1_serializeOpDeleteAccount) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3223,13 +3048,8 @@ func (m *awsRestjson1_serializeOpDeleteAppInstance) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/app-instances/{AppInstanceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3286,13 +3106,8 @@ func (m *awsRestjson1_serializeOpDeleteAppInstanceAdmin) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/app-instances/{AppInstanceArn}/admins/{AppInstanceAdminArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3358,13 +3173,8 @@ func (m *awsRestjson1_serializeOpDeleteAppInstanceStreamingConfigurations) Handl } opPath, opQuery := httpbinding.SplitURI("/app-instances/{AppInstanceArn}/streaming-configurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3421,13 +3231,8 @@ func (m *awsRestjson1_serializeOpDeleteAppInstanceUser) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/app-instance-users/{AppInstanceUserArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3484,13 +3289,8 @@ func (m *awsRestjson1_serializeOpDeleteAttendee) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/meetings/{MeetingId}/attendees/{AttendeeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3556,13 +3356,8 @@ func (m *awsRestjson1_serializeOpDeleteChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3624,13 +3419,8 @@ func (m *awsRestjson1_serializeOpDeleteChannelBan) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/bans/{MemberArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3701,13 +3491,8 @@ func (m *awsRestjson1_serializeOpDeleteChannelMembership) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/memberships/{MemberArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3778,13 +3563,8 @@ func (m *awsRestjson1_serializeOpDeleteChannelMessage) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/messages/{MessageId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3855,13 +3635,8 @@ func (m *awsRestjson1_serializeOpDeleteChannelModerator) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/moderators/{ChannelModeratorArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3932,13 +3707,8 @@ func (m *awsRestjson1_serializeOpDeleteEventsConfiguration) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/bots/{BotId}/events-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4004,13 +3774,8 @@ func (m *awsRestjson1_serializeOpDeleteMeeting) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/meetings/{MeetingId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4067,13 +3832,8 @@ func (m *awsRestjson1_serializeOpDeletePhoneNumber) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/phone-numbers/{PhoneNumberId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4130,13 +3890,8 @@ func (m *awsRestjson1_serializeOpDeleteProxySession) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/proxy-sessions/{ProxySessionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4202,13 +3957,8 @@ func (m *awsRestjson1_serializeOpDeleteRoom) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/rooms/{RoomId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4274,13 +4024,8 @@ func (m *awsRestjson1_serializeOpDeleteRoomMembership) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/rooms/{RoomId}/memberships/{MemberId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4355,13 +4100,8 @@ func (m *awsRestjson1_serializeOpDeleteSipMediaApplication) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/sip-media-applications/{SipMediaApplicationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4418,13 +4158,8 @@ func (m *awsRestjson1_serializeOpDeleteSipRule) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/sip-rules/{SipRuleId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4481,13 +4216,8 @@ func (m *awsRestjson1_serializeOpDeleteVoiceConnector) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4544,13 +4274,8 @@ func (m *awsRestjson1_serializeOpDeleteVoiceConnectorEmergencyCallingConfigurati } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/emergency-calling-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4607,13 +4332,8 @@ func (m *awsRestjson1_serializeOpDeleteVoiceConnectorGroup) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/voice-connector-groups/{VoiceConnectorGroupId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4670,13 +4390,8 @@ func (m *awsRestjson1_serializeOpDeleteVoiceConnectorOrigination) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/origination") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4733,13 +4448,8 @@ func (m *awsRestjson1_serializeOpDeleteVoiceConnectorProxy) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/programmable-numbers/proxy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4796,13 +4506,8 @@ func (m *awsRestjson1_serializeOpDeleteVoiceConnectorStreamingConfiguration) Han } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/streaming-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4859,13 +4564,8 @@ func (m *awsRestjson1_serializeOpDeleteVoiceConnectorTermination) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/termination") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4922,13 +4622,8 @@ func (m *awsRestjson1_serializeOpDeleteVoiceConnectorTerminationCredentials) Han } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/termination/credentials?operation=delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5010,13 +4705,8 @@ func (m *awsRestjson1_serializeOpDescribeAppInstance) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/app-instances/{AppInstanceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5073,13 +4763,8 @@ func (m *awsRestjson1_serializeOpDescribeAppInstanceAdmin) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/app-instances/{AppInstanceArn}/admins/{AppInstanceAdminArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5145,13 +4830,8 @@ func (m *awsRestjson1_serializeOpDescribeAppInstanceUser) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/app-instance-users/{AppInstanceUserArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5208,13 +4888,8 @@ func (m *awsRestjson1_serializeOpDescribeChannel) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5276,13 +4951,8 @@ func (m *awsRestjson1_serializeOpDescribeChannelBan) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/bans/{MemberArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5353,13 +5023,8 @@ func (m *awsRestjson1_serializeOpDescribeChannelMembership) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/memberships/{MemberArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5430,13 +5095,8 @@ func (m *awsRestjson1_serializeOpDescribeChannelMembershipForAppInstanceUser) Ha } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}?scope=app-instance-user-membership") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5502,13 +5162,8 @@ func (m *awsRestjson1_serializeOpDescribeChannelModeratedByAppInstanceUser) Hand } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}?scope=app-instance-user-moderated-channel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5574,13 +5229,8 @@ func (m *awsRestjson1_serializeOpDescribeChannelModerator) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/moderators/{ChannelModeratorArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5651,13 +5301,8 @@ func (m *awsRestjson1_serializeOpDisassociatePhoneNumberFromUser) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/users/{UserId}?operation=disassociate-phone-number") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5723,13 +5368,8 @@ func (m *awsRestjson1_serializeOpDisassociatePhoneNumbersFromVoiceConnector) Han } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}?operation=disassociate-phone-numbers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5811,13 +5451,8 @@ func (m *awsRestjson1_serializeOpDisassociatePhoneNumbersFromVoiceConnectorGroup } opPath, opQuery := httpbinding.SplitURI("/voice-connector-groups/{VoiceConnectorGroupId}?operation=disassociate-phone-numbers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5899,13 +5534,8 @@ func (m *awsRestjson1_serializeOpDisassociateSigninDelegateGroupsFromAccount) Ha } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}?operation=disassociate-signin-delegate-groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5987,13 +5617,8 @@ func (m *awsRestjson1_serializeOpGetAccount) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6050,13 +5675,8 @@ func (m *awsRestjson1_serializeOpGetAccountSettings) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6113,13 +5733,8 @@ func (m *awsRestjson1_serializeOpGetAppInstanceRetentionSettings) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/app-instances/{AppInstanceArn}/retention-settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6176,13 +5791,8 @@ func (m *awsRestjson1_serializeOpGetAppInstanceStreamingConfigurations) HandleSe } opPath, opQuery := httpbinding.SplitURI("/app-instances/{AppInstanceArn}/streaming-configurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6239,13 +5849,8 @@ func (m *awsRestjson1_serializeOpGetAttendee) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/meetings/{MeetingId}/attendees/{AttendeeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6311,13 +5916,8 @@ func (m *awsRestjson1_serializeOpGetBot) HandleSerialize(ctx context.Context, in } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/bots/{BotId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6383,13 +5983,8 @@ func (m *awsRestjson1_serializeOpGetChannelMessage) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/messages/{MessageId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6460,13 +6055,8 @@ func (m *awsRestjson1_serializeOpGetEventsConfiguration) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/bots/{BotId}/events-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6532,13 +6122,8 @@ func (m *awsRestjson1_serializeOpGetGlobalSettings) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6582,13 +6167,8 @@ func (m *awsRestjson1_serializeOpGetMeeting) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/meetings/{MeetingId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6645,13 +6225,8 @@ func (m *awsRestjson1_serializeOpGetMessagingSessionEndpoint) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/endpoints/messaging-session") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6695,13 +6270,8 @@ func (m *awsRestjson1_serializeOpGetPhoneNumber) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/phone-numbers/{PhoneNumberId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6758,13 +6328,8 @@ func (m *awsRestjson1_serializeOpGetPhoneNumberOrder) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/phone-number-orders/{PhoneNumberOrderId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6821,13 +6386,8 @@ func (m *awsRestjson1_serializeOpGetPhoneNumberSettings) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/settings/phone-number") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6871,13 +6431,8 @@ func (m *awsRestjson1_serializeOpGetProxySession) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/proxy-sessions/{ProxySessionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6943,13 +6498,8 @@ func (m *awsRestjson1_serializeOpGetRetentionSettings) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/retention-settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7006,13 +6556,8 @@ func (m *awsRestjson1_serializeOpGetRoom) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/rooms/{RoomId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7078,13 +6623,8 @@ func (m *awsRestjson1_serializeOpGetSipMediaApplication) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/sip-media-applications/{SipMediaApplicationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7141,13 +6681,8 @@ func (m *awsRestjson1_serializeOpGetSipMediaApplicationLoggingConfiguration) Han } opPath, opQuery := httpbinding.SplitURI("/sip-media-applications/{SipMediaApplicationId}/logging-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7204,13 +6739,8 @@ func (m *awsRestjson1_serializeOpGetSipRule) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/sip-rules/{SipRuleId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7267,13 +6797,8 @@ func (m *awsRestjson1_serializeOpGetUser) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/users/{UserId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7339,13 +6864,8 @@ func (m *awsRestjson1_serializeOpGetUserSettings) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/users/{UserId}/settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7411,13 +6931,8 @@ func (m *awsRestjson1_serializeOpGetVoiceConnector) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7474,13 +6989,8 @@ func (m *awsRestjson1_serializeOpGetVoiceConnectorEmergencyCallingConfiguration) } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/emergency-calling-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7537,13 +7047,8 @@ func (m *awsRestjson1_serializeOpGetVoiceConnectorGroup) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/voice-connector-groups/{VoiceConnectorGroupId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7600,13 +7105,8 @@ func (m *awsRestjson1_serializeOpGetVoiceConnectorLoggingConfiguration) HandleSe } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/logging-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7663,13 +7163,8 @@ func (m *awsRestjson1_serializeOpGetVoiceConnectorOrigination) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/origination") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7726,13 +7221,8 @@ func (m *awsRestjson1_serializeOpGetVoiceConnectorProxy) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/programmable-numbers/proxy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7789,13 +7279,8 @@ func (m *awsRestjson1_serializeOpGetVoiceConnectorStreamingConfiguration) Handle } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/streaming-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7852,13 +7337,8 @@ func (m *awsRestjson1_serializeOpGetVoiceConnectorTermination) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/termination") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7915,13 +7395,8 @@ func (m *awsRestjson1_serializeOpGetVoiceConnectorTerminationHealth) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/termination/health") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7978,13 +7453,8 @@ func (m *awsRestjson1_serializeOpInviteUsers) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/users?operation=add") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8071,13 +7541,8 @@ func (m *awsRestjson1_serializeOpListAccounts) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/accounts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8141,13 +7606,8 @@ func (m *awsRestjson1_serializeOpListAppInstanceAdmins) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/app-instances/{AppInstanceArn}/admins") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8212,13 +7672,8 @@ func (m *awsRestjson1_serializeOpListAppInstances) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/app-instances") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8274,13 +7729,8 @@ func (m *awsRestjson1_serializeOpListAppInstanceUsers) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/app-instance-users") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8340,13 +7790,8 @@ func (m *awsRestjson1_serializeOpListAttendees) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/meetings/{MeetingId}/attendees") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8411,13 +7856,8 @@ func (m *awsRestjson1_serializeOpListAttendeeTags) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/meetings/{MeetingId}/attendees/{AttendeeId}/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8483,13 +7923,8 @@ func (m *awsRestjson1_serializeOpListBots) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/bots") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8554,13 +7989,8 @@ func (m *awsRestjson1_serializeOpListChannelBans) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/bans") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8630,13 +8060,8 @@ func (m *awsRestjson1_serializeOpListChannelMemberships) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/memberships") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8710,13 +8135,8 @@ func (m *awsRestjson1_serializeOpListChannelMembershipsForAppInstanceUser) Handl } opPath, opQuery := httpbinding.SplitURI("/channels?scope=app-instance-user-memberships") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8781,13 +8201,8 @@ func (m *awsRestjson1_serializeOpListChannelMessages) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/messages") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8869,13 +8284,8 @@ func (m *awsRestjson1_serializeOpListChannelModerators) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/moderators") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8945,13 +8355,8 @@ func (m *awsRestjson1_serializeOpListChannels) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/channels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9020,13 +8425,8 @@ func (m *awsRestjson1_serializeOpListChannelsModeratedByAppInstanceUser) HandleS } opPath, opQuery := httpbinding.SplitURI("/channels?scope=app-instance-user-moderated-channels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9091,13 +8491,8 @@ func (m *awsRestjson1_serializeOpListMeetings) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/meetings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9153,13 +8548,8 @@ func (m *awsRestjson1_serializeOpListMeetingTags) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/meetings/{MeetingId}/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9216,13 +8606,8 @@ func (m *awsRestjson1_serializeOpListPhoneNumberOrders) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/phone-number-orders") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9278,13 +8663,8 @@ func (m *awsRestjson1_serializeOpListPhoneNumbers) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/phone-numbers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9356,13 +8736,8 @@ func (m *awsRestjson1_serializeOpListProxySessions) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/proxy-sessions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9431,13 +8806,8 @@ func (m *awsRestjson1_serializeOpListRoomMemberships) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/rooms/{RoomId}/memberships") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9511,13 +8881,8 @@ func (m *awsRestjson1_serializeOpListRooms) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/rooms") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9586,13 +8951,8 @@ func (m *awsRestjson1_serializeOpListSipMediaApplications) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/sip-media-applications") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9648,13 +9008,8 @@ func (m *awsRestjson1_serializeOpListSipRules) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/sip-rules") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9714,13 +9069,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9772,13 +9122,8 @@ func (m *awsRestjson1_serializeOpListUsers) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/users") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9851,13 +9196,8 @@ func (m *awsRestjson1_serializeOpListVoiceConnectorGroups) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/voice-connector-groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9913,13 +9253,8 @@ func (m *awsRestjson1_serializeOpListVoiceConnectors) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/voice-connectors") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9975,13 +9310,8 @@ func (m *awsRestjson1_serializeOpListVoiceConnectorTerminationCredentials) Handl } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/termination/credentials") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10038,13 +9368,8 @@ func (m *awsRestjson1_serializeOpLogoutUser) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/users/{UserId}?operation=logout") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10110,13 +9435,8 @@ func (m *awsRestjson1_serializeOpPutAppInstanceRetentionSettings) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/app-instances/{AppInstanceArn}/retention-settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10198,13 +9518,8 @@ func (m *awsRestjson1_serializeOpPutAppInstanceStreamingConfigurations) HandleSe } opPath, opQuery := httpbinding.SplitURI("/app-instances/{AppInstanceArn}/streaming-configurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10286,13 +9601,8 @@ func (m *awsRestjson1_serializeOpPutEventsConfiguration) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/bots/{BotId}/events-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10386,13 +9696,8 @@ func (m *awsRestjson1_serializeOpPutRetentionSettings) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/retention-settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10474,13 +9779,8 @@ func (m *awsRestjson1_serializeOpPutSipMediaApplicationLoggingConfiguration) Han } opPath, opQuery := httpbinding.SplitURI("/sip-media-applications/{SipMediaApplicationId}/logging-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10562,13 +9862,8 @@ func (m *awsRestjson1_serializeOpPutVoiceConnectorEmergencyCallingConfiguration) } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/emergency-calling-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10650,13 +9945,8 @@ func (m *awsRestjson1_serializeOpPutVoiceConnectorLoggingConfiguration) HandleSe } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/logging-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10738,13 +10028,8 @@ func (m *awsRestjson1_serializeOpPutVoiceConnectorOrigination) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/origination") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10826,13 +10111,8 @@ func (m *awsRestjson1_serializeOpPutVoiceConnectorProxy) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/programmable-numbers/proxy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10929,13 +10209,8 @@ func (m *awsRestjson1_serializeOpPutVoiceConnectorStreamingConfiguration) Handle } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/streaming-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11017,13 +10292,8 @@ func (m *awsRestjson1_serializeOpPutVoiceConnectorTermination) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/termination") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11105,13 +10375,8 @@ func (m *awsRestjson1_serializeOpPutVoiceConnectorTerminationCredentials) Handle } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/termination/credentials?operation=put") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11193,13 +10458,8 @@ func (m *awsRestjson1_serializeOpRedactChannelMessage) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/messages/{MessageId}?operation=redact") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11270,13 +10530,8 @@ func (m *awsRestjson1_serializeOpRedactConversationMessage) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/conversations/{ConversationId}/messages/{MessageId}?operation=redact") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11351,13 +10606,8 @@ func (m *awsRestjson1_serializeOpRedactRoomMessage) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/rooms/{RoomId}/messages/{MessageId}?operation=redact") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11432,13 +10682,8 @@ func (m *awsRestjson1_serializeOpRegenerateSecurityToken) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/bots/{BotId}?operation=regenerate-security-token") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11504,13 +10749,8 @@ func (m *awsRestjson1_serializeOpResetPersonalPIN) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/users/{UserId}?operation=reset-personal-pin") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11576,13 +10816,8 @@ func (m *awsRestjson1_serializeOpRestorePhoneNumber) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/phone-numbers/{PhoneNumberId}?operation=restore") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11639,13 +10874,8 @@ func (m *awsRestjson1_serializeOpSearchAvailablePhoneNumbers) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/search?type=phone-numbers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11721,13 +10951,8 @@ func (m *awsRestjson1_serializeOpSendChannelMessage) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/messages") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11832,13 +11057,8 @@ func (m *awsRestjson1_serializeOpTagAttendee) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/meetings/{MeetingId}/attendees/{AttendeeId}/tags?operation=add") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11929,13 +11149,8 @@ func (m *awsRestjson1_serializeOpTagMeeting) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/meetings/{MeetingId}/tags?operation=add") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12017,13 +11232,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags?operation=tag-resource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12097,13 +11307,8 @@ func (m *awsRestjson1_serializeOpUntagAttendee) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/meetings/{MeetingId}/attendees/{AttendeeId}/tags?operation=delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12194,13 +11399,8 @@ func (m *awsRestjson1_serializeOpUntagMeeting) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/meetings/{MeetingId}/tags?operation=delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12282,13 +11482,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags?operation=untag-resource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12362,13 +11557,8 @@ func (m *awsRestjson1_serializeOpUpdateAccount) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12448,13 +11638,8 @@ func (m *awsRestjson1_serializeOpUpdateAccountSettings) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12536,13 +11721,8 @@ func (m *awsRestjson1_serializeOpUpdateAppInstance) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/app-instances/{AppInstanceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12627,13 +11807,8 @@ func (m *awsRestjson1_serializeOpUpdateAppInstanceUser) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/app-instance-users/{AppInstanceUserArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12718,13 +11893,8 @@ func (m *awsRestjson1_serializeOpUpdateBot) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/bots/{BotId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12813,13 +11983,8 @@ func (m *awsRestjson1_serializeOpUpdateChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12914,13 +12079,8 @@ func (m *awsRestjson1_serializeOpUpdateChannelMessage) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/messages/{MessageId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13019,13 +12179,8 @@ func (m *awsRestjson1_serializeOpUpdateChannelReadMarker) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/channels/{ChannelArn}/readMarker") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13087,13 +12242,8 @@ func (m *awsRestjson1_serializeOpUpdateGlobalSettings) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13169,13 +12319,8 @@ func (m *awsRestjson1_serializeOpUpdatePhoneNumber) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/phone-numbers/{PhoneNumberId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13260,13 +12405,8 @@ func (m *awsRestjson1_serializeOpUpdatePhoneNumberSettings) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/settings/phone-number") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13333,13 +12473,8 @@ func (m *awsRestjson1_serializeOpUpdateProxySession) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}/proxy-sessions/{ProxySessionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13435,13 +12570,8 @@ func (m *awsRestjson1_serializeOpUpdateRoom) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/rooms/{RoomId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13530,13 +12660,8 @@ func (m *awsRestjson1_serializeOpUpdateRoomMembership) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/rooms/{RoomId}/memberships/{MemberId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13634,13 +12759,8 @@ func (m *awsRestjson1_serializeOpUpdateSipMediaApplication) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/sip-media-applications/{SipMediaApplicationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13727,13 +12847,8 @@ func (m *awsRestjson1_serializeOpUpdateSipRule) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/sip-rules/{SipRuleId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13825,13 +12940,8 @@ func (m *awsRestjson1_serializeOpUpdateUser) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/users/{UserId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13932,13 +13042,8 @@ func (m *awsRestjson1_serializeOpUpdateUserSettings) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AccountId}/users/{UserId}/settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -14029,13 +13134,8 @@ func (m *awsRestjson1_serializeOpUpdateVoiceConnector) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/voice-connectors/{VoiceConnectorId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -14120,13 +13220,8 @@ func (m *awsRestjson1_serializeOpUpdateVoiceConnectorGroup) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/voice-connector-groups/{VoiceConnectorGroupId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/clouddirectory/go.mod b/service/clouddirectory/go.mod index 883eb7e8a1c..e7551c87445 100644 --- a/service/clouddirectory/go.mod +++ b/service/clouddirectory/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/clouddirectory/go.sum b/service/clouddirectory/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/clouddirectory/go.sum +++ b/service/clouddirectory/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/clouddirectory/serializers.go b/service/clouddirectory/serializers.go index 62820951870..1717668086d 100644 --- a/service/clouddirectory/serializers.go +++ b/service/clouddirectory/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpAddFacetToObject) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/object/facets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -135,13 +130,8 @@ func (m *awsRestjson1_serializeOpApplySchema) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/schema/apply") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -217,13 +207,8 @@ func (m *awsRestjson1_serializeOpAttachObject) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/object/attach") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -313,13 +298,8 @@ func (m *awsRestjson1_serializeOpAttachPolicy) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/policy/attach") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -404,13 +384,8 @@ func (m *awsRestjson1_serializeOpAttachToIndex) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/index/attach") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -495,13 +470,8 @@ func (m *awsRestjson1_serializeOpAttachTypedLink) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/typedlink/attach") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -600,13 +570,8 @@ func (m *awsRestjson1_serializeOpBatchRead) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/batchread") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -689,13 +654,8 @@ func (m *awsRestjson1_serializeOpBatchWrite) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/batchwrite") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -773,13 +733,8 @@ func (m *awsRestjson1_serializeOpCreateDirectory) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/directory/create") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -855,13 +810,8 @@ func (m *awsRestjson1_serializeOpCreateFacet) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/facet/create") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -954,13 +904,8 @@ func (m *awsRestjson1_serializeOpCreateIndex) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/index") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1055,13 +1000,8 @@ func (m *awsRestjson1_serializeOpCreateObject) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/object") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1158,13 +1098,8 @@ func (m *awsRestjson1_serializeOpCreateSchema) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/schema/create") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1231,13 +1166,8 @@ func (m *awsRestjson1_serializeOpCreateTypedLinkFacet) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/typedlink/facet/create") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1315,13 +1245,8 @@ func (m *awsRestjson1_serializeOpDeleteDirectory) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/directory") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1374,13 +1299,8 @@ func (m *awsRestjson1_serializeOpDeleteFacet) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/facet/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1456,13 +1376,8 @@ func (m *awsRestjson1_serializeOpDeleteObject) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/object/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1540,13 +1455,8 @@ func (m *awsRestjson1_serializeOpDeleteSchema) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/schema") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1599,13 +1509,8 @@ func (m *awsRestjson1_serializeOpDeleteTypedLinkFacet) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/typedlink/facet/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1681,13 +1586,8 @@ func (m *awsRestjson1_serializeOpDetachFromIndex) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/index/detach") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1772,13 +1672,8 @@ func (m *awsRestjson1_serializeOpDetachObject) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/object/detach") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1861,13 +1756,8 @@ func (m *awsRestjson1_serializeOpDetachPolicy) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/policy/detach") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1952,13 +1842,8 @@ func (m *awsRestjson1_serializeOpDetachTypedLink) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/typedlink/detach") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2036,13 +1921,8 @@ func (m *awsRestjson1_serializeOpDisableDirectory) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/directory/disable") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2095,13 +1975,8 @@ func (m *awsRestjson1_serializeOpEnableDirectory) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/directory/enable") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2154,13 +2029,8 @@ func (m *awsRestjson1_serializeOpGetAppliedSchemaVersion) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/schema/getappliedschema") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2227,13 +2097,8 @@ func (m *awsRestjson1_serializeOpGetDirectory) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/directory/get") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2286,13 +2151,8 @@ func (m *awsRestjson1_serializeOpGetFacet) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/facet") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2368,13 +2228,8 @@ func (m *awsRestjson1_serializeOpGetLinkAttributes) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/typedlink/attributes/get") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2464,13 +2319,8 @@ func (m *awsRestjson1_serializeOpGetObjectAttributes) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/object/attributes/get") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2567,13 +2417,8 @@ func (m *awsRestjson1_serializeOpGetObjectInformation) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/object/information") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2656,13 +2501,8 @@ func (m *awsRestjson1_serializeOpGetSchemaAsJson) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/schema/json") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2715,13 +2555,8 @@ func (m *awsRestjson1_serializeOpGetTypedLinkFacetInformation) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/typedlink/facet/get") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2797,13 +2632,8 @@ func (m *awsRestjson1_serializeOpListAppliedSchemaArns) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/schema/applied") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2885,13 +2715,8 @@ func (m *awsRestjson1_serializeOpListAttachedIndices) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/object/indices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2984,13 +2809,8 @@ func (m *awsRestjson1_serializeOpListDevelopmentSchemaArns) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/schema/development") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3062,13 +2882,8 @@ func (m *awsRestjson1_serializeOpListDirectories) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/directory/list") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3145,13 +2960,8 @@ func (m *awsRestjson1_serializeOpListFacetAttributes) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/facet/attributes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3237,13 +3047,8 @@ func (m *awsRestjson1_serializeOpListFacetNames) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/facet/list") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3324,13 +3129,8 @@ func (m *awsRestjson1_serializeOpListIncomingTypedLinks) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/typedlink/incoming") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3437,13 +3237,8 @@ func (m *awsRestjson1_serializeOpListIndex) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/index/targets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3543,13 +3338,8 @@ func (m *awsRestjson1_serializeOpListManagedSchemaArns) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/schema/managed") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3626,13 +3416,8 @@ func (m *awsRestjson1_serializeOpListObjectAttributes) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/object/attributes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3732,13 +3517,8 @@ func (m *awsRestjson1_serializeOpListObjectChildren) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/object/children") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3831,13 +3611,8 @@ func (m *awsRestjson1_serializeOpListObjectParentPaths) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/object/parentpaths") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3925,13 +3700,8 @@ func (m *awsRestjson1_serializeOpListObjectParents) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/object/parent") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4029,13 +3799,8 @@ func (m *awsRestjson1_serializeOpListObjectPolicies) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/object/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4128,13 +3893,8 @@ func (m *awsRestjson1_serializeOpListOutgoingTypedLinks) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/typedlink/outgoing") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4241,13 +4001,8 @@ func (m *awsRestjson1_serializeOpListPolicyAttachments) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/policy/attachment") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4340,13 +4095,8 @@ func (m *awsRestjson1_serializeOpListPublishedSchemaArns) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/schema/published") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4423,13 +4173,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4506,13 +4251,8 @@ func (m *awsRestjson1_serializeOpListTypedLinkFacetAttributes) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/typedlink/facet/attributes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4598,13 +4338,8 @@ func (m *awsRestjson1_serializeOpListTypedLinkFacetNames) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/typedlink/facet/list") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4685,13 +4420,8 @@ func (m *awsRestjson1_serializeOpLookupPolicy) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/policy/lookup") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4779,13 +4509,8 @@ func (m *awsRestjson1_serializeOpPublishSchema) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/schema/publish") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4871,13 +4596,8 @@ func (m *awsRestjson1_serializeOpPutSchemaFromJson) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/schema/json") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4953,13 +4673,8 @@ func (m *awsRestjson1_serializeOpRemoveFacetFromObject) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/object/facets/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5044,13 +4759,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/tags/add") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5124,13 +4834,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/tags/remove") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5204,13 +4909,8 @@ func (m *awsRestjson1_serializeOpUpdateFacet) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/facet") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5298,13 +4998,8 @@ func (m *awsRestjson1_serializeOpUpdateLinkAttributes) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/typedlink/attributes/update") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5389,13 +5084,8 @@ func (m *awsRestjson1_serializeOpUpdateObjectAttributes) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/object/update") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5480,13 +5170,8 @@ func (m *awsRestjson1_serializeOpUpdateSchema) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/schema/update") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5562,13 +5247,8 @@ func (m *awsRestjson1_serializeOpUpdateTypedLinkFacet) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/typedlink/facet") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5658,13 +5338,8 @@ func (m *awsRestjson1_serializeOpUpgradeAppliedSchema) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/schema/upgradeapplied") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5741,13 +5416,8 @@ func (m *awsRestjson1_serializeOpUpgradePublishedSchema) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/amazonclouddirectory/2017-01-11/schema/upgradepublished") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/cloudfront/go.mod b/service/cloudfront/go.mod index 3b826d4f6f4..bdee666596c 100644 --- a/service/cloudfront/go.mod +++ b/service/cloudfront/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/cloudfront/go.sum b/service/cloudfront/go.sum index d937214c3eb..9ddcad9aa66 100644 --- a/service/cloudfront/go.sum +++ b/service/cloudfront/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= 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.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= diff --git a/service/cloudfront/serializers.go b/service/cloudfront/serializers.go index f86e80e3905..bd8a8a66b0c 100644 --- a/service/cloudfront/serializers.go +++ b/service/cloudfront/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestxml_serializeOpCreateCachePolicy) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/cache-policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -109,13 +104,8 @@ func (m *awsRestxml_serializeOpCreateCloudFrontOriginAccessIdentity) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/origin-access-identity/cloudfront") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -182,13 +172,8 @@ func (m *awsRestxml_serializeOpCreateDistribution) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distribution") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -255,13 +240,8 @@ func (m *awsRestxml_serializeOpCreateDistributionWithTags) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distribution?WithTags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -328,13 +308,8 @@ func (m *awsRestxml_serializeOpCreateFieldLevelEncryptionConfig) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/field-level-encryption") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -401,13 +376,8 @@ func (m *awsRestxml_serializeOpCreateFieldLevelEncryptionProfile) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/field-level-encryption-profile") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -474,13 +444,8 @@ func (m *awsRestxml_serializeOpCreateInvalidation) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distribution/{DistributionId}/invalidation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -560,13 +525,8 @@ func (m *awsRestxml_serializeOpCreateKeyGroup) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/key-group") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -633,13 +593,8 @@ func (m *awsRestxml_serializeOpCreateMonitoringSubscription) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distributions/{DistributionId}/monitoring-subscription") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -719,13 +674,8 @@ func (m *awsRestxml_serializeOpCreateOriginRequestPolicy) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/origin-request-policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -792,13 +742,8 @@ func (m *awsRestxml_serializeOpCreatePublicKey) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/public-key") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -865,13 +810,8 @@ func (m *awsRestxml_serializeOpCreateRealtimeLogConfig) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/realtime-log-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -986,13 +926,8 @@ func (m *awsRestxml_serializeOpCreateStreamingDistribution) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/streaming-distribution") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1059,13 +994,8 @@ func (m *awsRestxml_serializeOpCreateStreamingDistributionWithTags) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/streaming-distribution?WithTags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1132,13 +1062,8 @@ func (m *awsRestxml_serializeOpDeleteCachePolicy) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/cache-policy/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1200,13 +1125,8 @@ func (m *awsRestxml_serializeOpDeleteCloudFrontOriginAccessIdentity) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/origin-access-identity/cloudfront/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1268,13 +1188,8 @@ func (m *awsRestxml_serializeOpDeleteDistribution) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distribution/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1336,13 +1251,8 @@ func (m *awsRestxml_serializeOpDeleteFieldLevelEncryptionConfig) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/field-level-encryption/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1404,13 +1314,8 @@ func (m *awsRestxml_serializeOpDeleteFieldLevelEncryptionProfile) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/field-level-encryption-profile/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1472,13 +1377,8 @@ func (m *awsRestxml_serializeOpDeleteKeyGroup) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/key-group/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1540,13 +1440,8 @@ func (m *awsRestxml_serializeOpDeleteMonitoringSubscription) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distributions/{DistributionId}/monitoring-subscription") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1603,13 +1498,8 @@ func (m *awsRestxml_serializeOpDeleteOriginRequestPolicy) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/origin-request-policy/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1671,13 +1561,8 @@ func (m *awsRestxml_serializeOpDeletePublicKey) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/public-key/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1739,13 +1624,8 @@ func (m *awsRestxml_serializeOpDeleteRealtimeLogConfig) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/delete-realtime-log-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1834,13 +1714,8 @@ func (m *awsRestxml_serializeOpDeleteStreamingDistribution) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/streaming-distribution/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1902,13 +1777,8 @@ func (m *awsRestxml_serializeOpGetCachePolicy) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/cache-policy/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1965,13 +1835,8 @@ func (m *awsRestxml_serializeOpGetCachePolicyConfig) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/cache-policy/{Id}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2028,13 +1893,8 @@ func (m *awsRestxml_serializeOpGetCloudFrontOriginAccessIdentity) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/origin-access-identity/cloudfront/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2091,13 +1951,8 @@ func (m *awsRestxml_serializeOpGetCloudFrontOriginAccessIdentityConfig) HandleSe } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/origin-access-identity/cloudfront/{Id}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2154,13 +2009,8 @@ func (m *awsRestxml_serializeOpGetDistribution) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distribution/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2217,13 +2067,8 @@ func (m *awsRestxml_serializeOpGetDistributionConfig) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distribution/{Id}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2280,13 +2125,8 @@ func (m *awsRestxml_serializeOpGetFieldLevelEncryption) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/field-level-encryption/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2343,13 +2183,8 @@ func (m *awsRestxml_serializeOpGetFieldLevelEncryptionConfig) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/field-level-encryption/{Id}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2406,13 +2241,8 @@ func (m *awsRestxml_serializeOpGetFieldLevelEncryptionProfile) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/field-level-encryption-profile/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2469,13 +2299,8 @@ func (m *awsRestxml_serializeOpGetFieldLevelEncryptionProfileConfig) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/field-level-encryption-profile/{Id}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2532,13 +2357,8 @@ func (m *awsRestxml_serializeOpGetInvalidation) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distribution/{DistributionId}/invalidation/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2604,13 +2424,8 @@ func (m *awsRestxml_serializeOpGetKeyGroup) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/key-group/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2667,13 +2482,8 @@ func (m *awsRestxml_serializeOpGetKeyGroupConfig) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/key-group/{Id}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2730,13 +2540,8 @@ func (m *awsRestxml_serializeOpGetMonitoringSubscription) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distributions/{DistributionId}/monitoring-subscription") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2793,13 +2598,8 @@ func (m *awsRestxml_serializeOpGetOriginRequestPolicy) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/origin-request-policy/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2856,13 +2656,8 @@ func (m *awsRestxml_serializeOpGetOriginRequestPolicyConfig) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/origin-request-policy/{Id}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2919,13 +2714,8 @@ func (m *awsRestxml_serializeOpGetPublicKey) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/public-key/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2982,13 +2772,8 @@ func (m *awsRestxml_serializeOpGetPublicKeyConfig) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/public-key/{Id}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3045,13 +2830,8 @@ func (m *awsRestxml_serializeOpGetRealtimeLogConfig) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/get-realtime-log-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3140,13 +2920,8 @@ func (m *awsRestxml_serializeOpGetStreamingDistribution) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/streaming-distribution/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3203,13 +2978,8 @@ func (m *awsRestxml_serializeOpGetStreamingDistributionConfig) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/streaming-distribution/{Id}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3266,13 +3036,8 @@ func (m *awsRestxml_serializeOpListCachePolicies) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/cache-policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3332,13 +3097,8 @@ func (m *awsRestxml_serializeOpListCloudFrontOriginAccessIdentities) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/origin-access-identity/cloudfront") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3394,13 +3154,8 @@ func (m *awsRestxml_serializeOpListDistributions) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distribution") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3456,13 +3211,8 @@ func (m *awsRestxml_serializeOpListDistributionsByCachePolicyId) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distributionsByCachePolicyId/{CachePolicyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3527,13 +3277,8 @@ func (m *awsRestxml_serializeOpListDistributionsByKeyGroup) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distributionsByKeyGroupId/{KeyGroupId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3598,13 +3343,8 @@ func (m *awsRestxml_serializeOpListDistributionsByOriginRequestPolicyId) HandleS } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distributionsByOriginRequestPolicyId/{OriginRequestPolicyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3669,13 +3409,8 @@ func (m *awsRestxml_serializeOpListDistributionsByRealtimeLogConfig) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distributionsByRealtimeLogConfig") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3786,13 +3521,8 @@ func (m *awsRestxml_serializeOpListDistributionsByWebACLId) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distributionsByWebACLId/{WebACLId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3857,13 +3587,8 @@ func (m *awsRestxml_serializeOpListFieldLevelEncryptionConfigs) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/field-level-encryption") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3919,13 +3644,8 @@ func (m *awsRestxml_serializeOpListFieldLevelEncryptionProfiles) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/field-level-encryption-profile") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3981,13 +3701,8 @@ func (m *awsRestxml_serializeOpListInvalidations) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distribution/{DistributionId}/invalidation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4052,13 +3767,8 @@ func (m *awsRestxml_serializeOpListKeyGroups) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/key-group") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4114,13 +3824,8 @@ func (m *awsRestxml_serializeOpListOriginRequestPolicies) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/origin-request-policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4180,13 +3885,8 @@ func (m *awsRestxml_serializeOpListPublicKeys) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/public-key") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4242,13 +3942,8 @@ func (m *awsRestxml_serializeOpListRealtimeLogConfigs) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/realtime-log-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4304,13 +3999,8 @@ func (m *awsRestxml_serializeOpListStreamingDistributions) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/streaming-distribution") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4366,13 +4056,8 @@ func (m *awsRestxml_serializeOpListTagsForResource) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4424,13 +4109,8 @@ func (m *awsRestxml_serializeOpTagResource) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/tagging?Operation=Tag") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4505,13 +4185,8 @@ func (m *awsRestxml_serializeOpUntagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/tagging?Operation=Untag") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4586,13 +4261,8 @@ func (m *awsRestxml_serializeOpUpdateCachePolicy) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/cache-policy/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4677,13 +4347,8 @@ func (m *awsRestxml_serializeOpUpdateCloudFrontOriginAccessIdentity) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/origin-access-identity/cloudfront/{Id}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4768,13 +4433,8 @@ func (m *awsRestxml_serializeOpUpdateDistribution) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/distribution/{Id}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4859,13 +4519,8 @@ func (m *awsRestxml_serializeOpUpdateFieldLevelEncryptionConfig) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/field-level-encryption/{Id}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4950,13 +4605,8 @@ func (m *awsRestxml_serializeOpUpdateFieldLevelEncryptionProfile) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/field-level-encryption-profile/{Id}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5041,13 +4691,8 @@ func (m *awsRestxml_serializeOpUpdateKeyGroup) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/key-group/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5132,13 +4777,8 @@ func (m *awsRestxml_serializeOpUpdateOriginRequestPolicy) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/origin-request-policy/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5223,13 +4863,8 @@ func (m *awsRestxml_serializeOpUpdatePublicKey) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/public-key/{Id}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5314,13 +4949,8 @@ func (m *awsRestxml_serializeOpUpdateRealtimeLogConfig) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/realtime-log-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5446,13 +5076,8 @@ func (m *awsRestxml_serializeOpUpdateStreamingDistribution) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2020-05-31/streaming-distribution/{Id}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/cloudsearchdomain/go.mod b/service/cloudsearchdomain/go.mod index fe1f2f8e067..3716a9ea3af 100644 --- a/service/cloudsearchdomain/go.mod +++ b/service/cloudsearchdomain/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cloudsearchdomain/go.sum b/service/cloudsearchdomain/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/cloudsearchdomain/go.sum +++ b/service/cloudsearchdomain/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cloudsearchdomain/serializers.go b/service/cloudsearchdomain/serializers.go index 8eceab400f5..1c8061188e9 100644 --- a/service/cloudsearchdomain/serializers.go +++ b/service/cloudsearchdomain/serializers.go @@ -33,13 +33,8 @@ func (m *awsRestjson1_serializeOpSearch) HandleSerialize(ctx context.Context, in } opPath, opQuery := httpbinding.SplitURI("/2013-01-01/search?format=sdk&pretty=true") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -143,13 +138,8 @@ func (m *awsRestjson1_serializeOpSuggest) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/2013-01-01/suggest?format=sdk&pretty=true") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -209,13 +199,8 @@ func (m *awsRestjson1_serializeOpUploadDocuments) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2013-01-01/documents/batch?format=sdk") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/codeartifact/go.mod b/service/codeartifact/go.mod index 24e6233b6c4..6743ada8557 100644 --- a/service/codeartifact/go.mod +++ b/service/codeartifact/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codeartifact/go.sum b/service/codeartifact/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/codeartifact/go.sum +++ b/service/codeartifact/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/codeartifact/serializers.go b/service/codeartifact/serializers.go index c9d3546ac87..53bd52815c0 100644 --- a/service/codeartifact/serializers.go +++ b/service/codeartifact/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAssociateExternalConnection) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/v1/repository/external-connection") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -106,13 +101,8 @@ func (m *awsRestjson1_serializeOpCopyPackageVersions) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/package/versions/copy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -230,13 +220,8 @@ func (m *awsRestjson1_serializeOpCreateDomain) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/domain") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -318,13 +303,8 @@ func (m *awsRestjson1_serializeOpCreateRepository) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/repository") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -421,13 +401,8 @@ func (m *awsRestjson1_serializeOpDeleteDomain) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/domain") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -483,13 +458,8 @@ func (m *awsRestjson1_serializeOpDeleteDomainPermissionsPolicy) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/v1/domain/permissions/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -549,13 +519,8 @@ func (m *awsRestjson1_serializeOpDeletePackageVersions) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/package/versions/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -657,13 +622,8 @@ func (m *awsRestjson1_serializeOpDeleteRepository) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/repository") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -723,13 +683,8 @@ func (m *awsRestjson1_serializeOpDeleteRepositoryPermissionsPolicy) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/v1/repository/permissions/policies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -793,13 +748,8 @@ func (m *awsRestjson1_serializeOpDescribeDomain) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/domain") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -855,13 +805,8 @@ func (m *awsRestjson1_serializeOpDescribePackageVersion) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v1/package/version") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -937,13 +882,8 @@ func (m *awsRestjson1_serializeOpDescribeRepository) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/repository") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1003,13 +943,8 @@ func (m *awsRestjson1_serializeOpDisassociateExternalConnection) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/v1/repository/external-connection") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1073,13 +1008,8 @@ func (m *awsRestjson1_serializeOpDisposePackageVersions) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v1/package/versions/dispose") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1188,13 +1118,8 @@ func (m *awsRestjson1_serializeOpGetAuthorizationToken) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/authorization-token") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1254,13 +1179,8 @@ func (m *awsRestjson1_serializeOpGetDomainPermissionsPolicy) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v1/domain/permissions/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1316,13 +1236,8 @@ func (m *awsRestjson1_serializeOpGetPackageVersionAsset) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v1/package/version/asset") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1406,13 +1321,8 @@ func (m *awsRestjson1_serializeOpGetPackageVersionReadme) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/v1/package/version/readme") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1488,13 +1398,8 @@ func (m *awsRestjson1_serializeOpGetRepositoryEndpoint) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/repository/endpoint") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1558,13 +1463,8 @@ func (m *awsRestjson1_serializeOpGetRepositoryPermissionsPolicy) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/v1/repository/permissions/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1624,13 +1524,8 @@ func (m *awsRestjson1_serializeOpListDomains) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/domains") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1702,13 +1597,8 @@ func (m *awsRestjson1_serializeOpListPackages) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/packages") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1788,13 +1678,8 @@ func (m *awsRestjson1_serializeOpListPackageVersionAssets) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/v1/package/version/assets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1878,13 +1763,8 @@ func (m *awsRestjson1_serializeOpListPackageVersionDependencies) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/v1/package/version/dependencies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1964,13 +1844,8 @@ func (m *awsRestjson1_serializeOpListPackageVersions) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/package/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2058,13 +1933,8 @@ func (m *awsRestjson1_serializeOpListRepositories) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/repositories") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2124,13 +1994,8 @@ func (m *awsRestjson1_serializeOpListRepositoriesInDomain) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/v1/domain/repositories") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2202,13 +2067,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2260,13 +2120,8 @@ func (m *awsRestjson1_serializeOpPutDomainPermissionsPolicy) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v1/domain/permissions/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2348,13 +2203,8 @@ func (m *awsRestjson1_serializeOpPutRepositoryPermissionsPolicy) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/v1/repository/permissions/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2442,13 +2292,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/tag") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2525,13 +2370,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/untag") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2608,13 +2448,8 @@ func (m *awsRestjson1_serializeOpUpdatePackageVersionsStatus) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/v1/package/versions/update_status") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2728,13 +2563,8 @@ func (m *awsRestjson1_serializeOpUpdateRepository) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/repository") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/codeguruprofiler/go.mod b/service/codeguruprofiler/go.mod index 569b3897883..03c350c43f6 100644 --- a/service/codeguruprofiler/go.mod +++ b/service/codeguruprofiler/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codeguruprofiler/go.sum b/service/codeguruprofiler/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/codeguruprofiler/go.sum +++ b/service/codeguruprofiler/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/codeguruprofiler/serializers.go b/service/codeguruprofiler/serializers.go index 552883bb762..b9d1cf2505d 100644 --- a/service/codeguruprofiler/serializers.go +++ b/service/codeguruprofiler/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpAddNotificationChannels) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/profilingGroups/{profilingGroupName}/notificationConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -125,13 +120,8 @@ func (m *awsRestjson1_serializeOpBatchGetFrameMetricData) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/profilingGroups/{profilingGroupName}/frames/-/metrics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -229,13 +219,8 @@ func (m *awsRestjson1_serializeOpConfigureAgent) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/profilingGroups/{profilingGroupName}/configureAgent") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -322,13 +307,8 @@ func (m *awsRestjson1_serializeOpCreateProfilingGroup) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/profilingGroups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -422,13 +402,8 @@ func (m *awsRestjson1_serializeOpDeleteProfilingGroup) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/profilingGroups/{profilingGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -485,13 +460,8 @@ func (m *awsRestjson1_serializeOpDescribeProfilingGroup) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/profilingGroups/{profilingGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -548,13 +518,8 @@ func (m *awsRestjson1_serializeOpGetFindingsReportAccountSummary) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/internal/findingsReports") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -614,13 +579,8 @@ func (m *awsRestjson1_serializeOpGetNotificationConfiguration) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/profilingGroups/{profilingGroupName}/notificationConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -677,13 +637,8 @@ func (m *awsRestjson1_serializeOpGetPolicy) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/profilingGroups/{profilingGroupName}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -740,13 +695,8 @@ func (m *awsRestjson1_serializeOpGetProfile) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/profilingGroups/{profilingGroupName}/profile") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -824,13 +774,8 @@ func (m *awsRestjson1_serializeOpGetRecommendations) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/internal/profilingGroups/{profilingGroupName}/recommendations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -899,13 +844,8 @@ func (m *awsRestjson1_serializeOpListFindingsReports) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/internal/profilingGroups/{profilingGroupName}/findingsReports") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -982,13 +922,8 @@ func (m *awsRestjson1_serializeOpListProfileTimes) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/profilingGroups/{profilingGroupName}/profileTimes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1069,13 +1004,8 @@ func (m *awsRestjson1_serializeOpListProfilingGroups) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/profilingGroups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1135,13 +1065,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1198,13 +1123,8 @@ func (m *awsRestjson1_serializeOpPostAgentProfile) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/profilingGroups/{profilingGroupName}/agentProfile") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1281,13 +1201,8 @@ func (m *awsRestjson1_serializeOpPutPermission) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/profilingGroups/{profilingGroupName}/policy/{actionGroup}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1383,13 +1298,8 @@ func (m *awsRestjson1_serializeOpRemoveNotificationChannel) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/profilingGroups/{profilingGroupName}/notificationConfiguration/{channelId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1455,13 +1365,8 @@ func (m *awsRestjson1_serializeOpRemovePermission) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/profilingGroups/{profilingGroupName}/policy/{actionGroup}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1531,13 +1436,8 @@ func (m *awsRestjson1_serializeOpSubmitFeedback) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/internal/profilingGroups/{profilingGroupName}/anomalies/{anomalyInstanceId}/feedback") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1631,13 +1531,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1719,13 +1614,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1788,13 +1678,8 @@ func (m *awsRestjson1_serializeOpUpdateProfilingGroup) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/profilingGroups/{profilingGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/codegurureviewer/go.mod b/service/codegurureviewer/go.mod index c6139ab894c..7437e46c71b 100644 --- a/service/codegurureviewer/go.mod +++ b/service/codegurureviewer/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codegurureviewer/go.sum b/service/codegurureviewer/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/codegurureviewer/go.sum +++ b/service/codegurureviewer/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/codegurureviewer/serializers.go b/service/codegurureviewer/serializers.go index 482a363990b..9ca6a9f38fa 100644 --- a/service/codegurureviewer/serializers.go +++ b/service/codegurureviewer/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAssociateRepository) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/associations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -123,13 +118,8 @@ func (m *awsRestjson1_serializeOpCreateCodeReview) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/codereviews") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -213,13 +203,8 @@ func (m *awsRestjson1_serializeOpDescribeCodeReview) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/codereviews/{CodeReviewArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -276,13 +261,8 @@ func (m *awsRestjson1_serializeOpDescribeRecommendationFeedback) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/feedback/{CodeReviewArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -347,13 +327,8 @@ func (m *awsRestjson1_serializeOpDescribeRepositoryAssociation) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/associations/{AssociationArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -410,13 +385,8 @@ func (m *awsRestjson1_serializeOpDisassociateRepository) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/associations/{AssociationArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -473,13 +443,8 @@ func (m *awsRestjson1_serializeOpListCodeReviews) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/codereviews") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -557,13 +522,8 @@ func (m *awsRestjson1_serializeOpListRecommendationFeedback) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/feedback/{CodeReviewArn}/RecommendationFeedback") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -640,13 +600,8 @@ func (m *awsRestjson1_serializeOpListRecommendations) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/codereviews/{CodeReviewArn}/Recommendations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -711,13 +666,8 @@ func (m *awsRestjson1_serializeOpListRepositoryAssociations) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/associations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -797,13 +747,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -860,13 +805,8 @@ func (m *awsRestjson1_serializeOpPutRecommendationFeedback) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/feedback") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -945,13 +885,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1033,13 +968,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/codestarnotifications/go.mod b/service/codestarnotifications/go.mod index 72f819230e7..8f8aeaf9d67 100644 --- a/service/codestarnotifications/go.mod +++ b/service/codestarnotifications/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/codestarnotifications/go.sum b/service/codestarnotifications/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/codestarnotifications/go.sum +++ b/service/codestarnotifications/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/codestarnotifications/serializers.go b/service/codestarnotifications/serializers.go index d9b55b29d0f..f7bd13fc368 100644 --- a/service/codestarnotifications/serializers.go +++ b/service/codestarnotifications/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateNotificationRule) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/createNotificationRule") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -150,13 +145,8 @@ func (m *awsRestjson1_serializeOpDeleteNotificationRule) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/deleteNotificationRule") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -223,13 +213,8 @@ func (m *awsRestjson1_serializeOpDeleteTarget) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/deleteTarget") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -301,13 +286,8 @@ func (m *awsRestjson1_serializeOpDescribeNotificationRule) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/describeNotificationRule") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -374,13 +354,8 @@ func (m *awsRestjson1_serializeOpListEventTypes) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/listEventTypes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -459,13 +434,8 @@ func (m *awsRestjson1_serializeOpListNotificationRules) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/listNotificationRules") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -544,13 +514,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/listTagsForResource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -617,13 +582,8 @@ func (m *awsRestjson1_serializeOpListTargets) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/listTargets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -702,13 +662,8 @@ func (m *awsRestjson1_serializeOpSubscribe) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/subscribe") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -787,13 +742,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tagResource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -867,13 +817,8 @@ func (m *awsRestjson1_serializeOpUnsubscribe) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/unsubscribe") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -945,13 +890,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/untagResource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1025,13 +965,8 @@ func (m *awsRestjson1_serializeOpUpdateNotificationRule) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/updateNotificationRule") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/cognitosync/go.mod b/service/cognitosync/go.mod index aca06a37b88..a5bd3b97cb1 100644 --- a/service/cognitosync/go.mod +++ b/service/cognitosync/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/cognitosync/go.sum b/service/cognitosync/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/cognitosync/go.sum +++ b/service/cognitosync/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/cognitosync/serializers.go b/service/cognitosync/serializers.go index eedaea2f986..c9e0e724ccc 100644 --- a/service/cognitosync/serializers.go +++ b/service/cognitosync/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpBulkPublish) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}/bulkpublish") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -100,13 +95,8 @@ func (m *awsRestjson1_serializeOpDeleteDataset) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}/identities/{IdentityId}/datasets/{DatasetName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -181,13 +171,8 @@ func (m *awsRestjson1_serializeOpDescribeDataset) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}/identities/{IdentityId}/datasets/{DatasetName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -262,13 +247,8 @@ func (m *awsRestjson1_serializeOpDescribeIdentityPoolUsage) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -325,13 +305,8 @@ func (m *awsRestjson1_serializeOpDescribeIdentityUsage) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}/identities/{IdentityId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -397,13 +372,8 @@ func (m *awsRestjson1_serializeOpGetBulkPublishDetails) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}/getBulkPublishDetails") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -460,13 +430,8 @@ func (m *awsRestjson1_serializeOpGetCognitoEvents) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}/events") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -523,13 +488,8 @@ func (m *awsRestjson1_serializeOpGetIdentityPoolConfiguration) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}/configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -586,13 +546,8 @@ func (m *awsRestjson1_serializeOpListDatasets) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}/identities/{IdentityId}/datasets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -666,13 +621,8 @@ func (m *awsRestjson1_serializeOpListIdentityPoolUsage) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/identitypools") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -728,13 +678,8 @@ func (m *awsRestjson1_serializeOpListRecords) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}/identities/{IdentityId}/datasets/{DatasetName}/records") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -825,13 +770,8 @@ func (m *awsRestjson1_serializeOpRegisterDevice) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}/identity/{IdentityId}/device") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -925,13 +865,8 @@ func (m *awsRestjson1_serializeOpSetCognitoEvents) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}/events") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1013,13 +948,8 @@ func (m *awsRestjson1_serializeOpSetIdentityPoolConfiguration) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}/configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1108,13 +1038,8 @@ func (m *awsRestjson1_serializeOpSubscribeToDataset) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}/identities/{IdentityId}/datasets/{DatasetName}/subscriptions/{DeviceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1198,13 +1123,8 @@ func (m *awsRestjson1_serializeOpUnsubscribeFromDataset) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}/identities/{IdentityId}/datasets/{DatasetName}/subscriptions/{DeviceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1288,13 +1208,8 @@ func (m *awsRestjson1_serializeOpUpdateRecords) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/identitypools/{IdentityPoolId}/identities/{IdentityId}/datasets/{DatasetName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/connect/go.mod b/service/connect/go.mod index 00fc0238782..29e37ee17c3 100644 --- a/service/connect/go.mod +++ b/service/connect/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/connect/go.sum b/service/connect/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/connect/go.sum +++ b/service/connect/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/connect/serializers.go b/service/connect/serializers.go index 465ef7e8087..e4274e94870 100644 --- a/service/connect/serializers.go +++ b/service/connect/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpAssociateApprovedOrigin) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/approved-origin") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -123,13 +118,8 @@ func (m *awsRestjson1_serializeOpAssociateInstanceStorageConfig) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/storage-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -216,13 +206,8 @@ func (m *awsRestjson1_serializeOpAssociateLambdaFunction) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/lambda-function") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -302,13 +287,8 @@ func (m *awsRestjson1_serializeOpAssociateLexBot) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/lex-bot") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -390,13 +370,8 @@ func (m *awsRestjson1_serializeOpAssociateQueueQuickConnects) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/queues/{InstanceId}/{QueueId}/associate-quick-connects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -487,13 +462,8 @@ func (m *awsRestjson1_serializeOpAssociateRoutingProfileQueues) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/routing-profiles/{InstanceId}/{RoutingProfileId}/associate-queues") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -584,13 +554,8 @@ func (m *awsRestjson1_serializeOpAssociateSecurityKey) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/security-key") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -670,13 +635,8 @@ func (m *awsRestjson1_serializeOpCreateContactFlow) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/contact-flows/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -778,13 +738,8 @@ func (m *awsRestjson1_serializeOpCreateInstance) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/instance") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -876,13 +831,8 @@ func (m *awsRestjson1_serializeOpCreateIntegrationAssociation) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/integration-associations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -982,13 +932,8 @@ func (m *awsRestjson1_serializeOpCreateQueue) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/queues/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1104,13 +1049,8 @@ func (m *awsRestjson1_serializeOpCreateQuickConnect) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/quick-connects/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1209,13 +1149,8 @@ func (m *awsRestjson1_serializeOpCreateRoutingProfile) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/routing-profiles/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1326,13 +1261,8 @@ func (m *awsRestjson1_serializeOpCreateUseCase) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/integration-associations/{IntegrationAssociationId}/use-cases") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1421,13 +1351,8 @@ func (m *awsRestjson1_serializeOpCreateUser) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/users/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1555,13 +1480,8 @@ func (m *awsRestjson1_serializeOpCreateUserHierarchyGroup) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/user-hierarchy-groups/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1646,13 +1566,8 @@ func (m *awsRestjson1_serializeOpDeleteInstance) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1709,13 +1624,8 @@ func (m *awsRestjson1_serializeOpDeleteIntegrationAssociation) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/integration-associations/{IntegrationAssociationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1781,13 +1691,8 @@ func (m *awsRestjson1_serializeOpDeleteQuickConnect) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/quick-connects/{InstanceId}/{QuickConnectId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1853,13 +1758,8 @@ func (m *awsRestjson1_serializeOpDeleteUseCase) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/integration-associations/{IntegrationAssociationId}/use-cases/{UseCaseId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1934,13 +1834,8 @@ func (m *awsRestjson1_serializeOpDeleteUser) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/users/{InstanceId}/{UserId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2006,13 +1901,8 @@ func (m *awsRestjson1_serializeOpDeleteUserHierarchyGroup) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/user-hierarchy-groups/{InstanceId}/{HierarchyGroupId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2078,13 +1968,8 @@ func (m *awsRestjson1_serializeOpDescribeContactFlow) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/contact-flows/{InstanceId}/{ContactFlowId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2150,13 +2035,8 @@ func (m *awsRestjson1_serializeOpDescribeHoursOfOperation) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/hours-of-operations/{InstanceId}/{HoursOfOperationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2222,13 +2102,8 @@ func (m *awsRestjson1_serializeOpDescribeInstance) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2285,13 +2160,8 @@ func (m *awsRestjson1_serializeOpDescribeInstanceAttribute) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/attribute/{AttributeType}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2357,13 +2227,8 @@ func (m *awsRestjson1_serializeOpDescribeInstanceStorageConfig) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/storage-config/{AssociationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2433,13 +2298,8 @@ func (m *awsRestjson1_serializeOpDescribeQueue) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/queues/{InstanceId}/{QueueId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2505,13 +2365,8 @@ func (m *awsRestjson1_serializeOpDescribeQuickConnect) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/quick-connects/{InstanceId}/{QuickConnectId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2577,13 +2432,8 @@ func (m *awsRestjson1_serializeOpDescribeRoutingProfile) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/routing-profiles/{InstanceId}/{RoutingProfileId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2649,13 +2499,8 @@ func (m *awsRestjson1_serializeOpDescribeUser) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/users/{InstanceId}/{UserId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2721,13 +2566,8 @@ func (m *awsRestjson1_serializeOpDescribeUserHierarchyGroup) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/user-hierarchy-groups/{InstanceId}/{HierarchyGroupId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2793,13 +2633,8 @@ func (m *awsRestjson1_serializeOpDescribeUserHierarchyStructure) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/user-hierarchy-structure/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2856,13 +2691,8 @@ func (m *awsRestjson1_serializeOpDisassociateApprovedOrigin) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/approved-origin") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2923,13 +2753,8 @@ func (m *awsRestjson1_serializeOpDisassociateInstanceStorageConfig) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/storage-config/{AssociationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2999,13 +2824,8 @@ func (m *awsRestjson1_serializeOpDisassociateLambdaFunction) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/lambda-function") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3066,13 +2886,8 @@ func (m *awsRestjson1_serializeOpDisassociateLexBot) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/lex-bot") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3137,13 +2952,8 @@ func (m *awsRestjson1_serializeOpDisassociateQueueQuickConnects) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/queues/{InstanceId}/{QueueId}/disassociate-quick-connects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3234,13 +3044,8 @@ func (m *awsRestjson1_serializeOpDisassociateRoutingProfileQueues) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/routing-profiles/{InstanceId}/{RoutingProfileId}/disassociate-queues") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3331,13 +3136,8 @@ func (m *awsRestjson1_serializeOpDisassociateSecurityKey) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/security-key/{AssociationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3403,13 +3203,8 @@ func (m *awsRestjson1_serializeOpGetContactAttributes) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/contact/attributes/{InstanceId}/{InitialContactId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3475,13 +3270,8 @@ func (m *awsRestjson1_serializeOpGetCurrentMetricData) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/metrics/current/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3587,13 +3377,8 @@ func (m *awsRestjson1_serializeOpGetFederationToken) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/user/federate/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3650,13 +3435,8 @@ func (m *awsRestjson1_serializeOpGetMetricData) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/metrics/historical/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3772,13 +3552,8 @@ func (m *awsRestjson1_serializeOpListApprovedOrigins) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/approved-origins") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3843,13 +3618,8 @@ func (m *awsRestjson1_serializeOpListContactFlows) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/contact-flows-summary/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3920,13 +3690,8 @@ func (m *awsRestjson1_serializeOpListHoursOfOperations) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/hours-of-operations-summary/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3991,13 +3756,8 @@ func (m *awsRestjson1_serializeOpListInstanceAttributes) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/attributes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4062,13 +3822,8 @@ func (m *awsRestjson1_serializeOpListInstances) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/instance") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4124,13 +3879,8 @@ func (m *awsRestjson1_serializeOpListInstanceStorageConfigs) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/storage-configs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4199,13 +3949,8 @@ func (m *awsRestjson1_serializeOpListIntegrationAssociations) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/integration-associations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4270,13 +4015,8 @@ func (m *awsRestjson1_serializeOpListLambdaFunctions) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/lambda-functions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4341,13 +4081,8 @@ func (m *awsRestjson1_serializeOpListLexBots) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/lex-bots") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4412,13 +4147,8 @@ func (m *awsRestjson1_serializeOpListPhoneNumbers) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/phone-numbers-summary/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4495,13 +4225,8 @@ func (m *awsRestjson1_serializeOpListPrompts) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/prompts-summary/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4566,13 +4291,8 @@ func (m *awsRestjson1_serializeOpListQueueQuickConnects) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/queues/{InstanceId}/{QueueId}/quick-connects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4646,13 +4366,8 @@ func (m *awsRestjson1_serializeOpListQueues) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/queues-summary/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4723,13 +4438,8 @@ func (m *awsRestjson1_serializeOpListQuickConnects) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/quick-connects/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4800,13 +4510,8 @@ func (m *awsRestjson1_serializeOpListRoutingProfileQueues) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/routing-profiles/{InstanceId}/{RoutingProfileId}/queues") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4880,13 +4585,8 @@ func (m *awsRestjson1_serializeOpListRoutingProfiles) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/routing-profiles-summary/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4951,13 +4651,8 @@ func (m *awsRestjson1_serializeOpListSecurityKeys) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/security-keys") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5022,13 +4717,8 @@ func (m *awsRestjson1_serializeOpListSecurityProfiles) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/security-profiles-summary/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5093,13 +4783,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5156,13 +4841,8 @@ func (m *awsRestjson1_serializeOpListUseCases) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/integration-associations/{IntegrationAssociationId}/use-cases") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5236,13 +4916,8 @@ func (m *awsRestjson1_serializeOpListUserHierarchyGroups) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/user-hierarchy-groups-summary/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5307,13 +4982,8 @@ func (m *awsRestjson1_serializeOpListUsers) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/users-summary/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5378,13 +5048,8 @@ func (m *awsRestjson1_serializeOpResumeContactRecording) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/contact/resume-recording") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5461,13 +5126,8 @@ func (m *awsRestjson1_serializeOpStartChatContact) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/contact/chat") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5565,13 +5225,8 @@ func (m *awsRestjson1_serializeOpStartContactRecording) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/contact/start-recording") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5655,13 +5310,8 @@ func (m *awsRestjson1_serializeOpStartOutboundVoiceContact) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/contact/outbound-voice") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5760,13 +5410,8 @@ func (m *awsRestjson1_serializeOpStartTaskContact) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/contact/task") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5872,13 +5517,8 @@ func (m *awsRestjson1_serializeOpStopContact) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/contact/stop") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5950,13 +5590,8 @@ func (m *awsRestjson1_serializeOpStopContactRecording) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/contact/stop-recording") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6033,13 +5668,8 @@ func (m *awsRestjson1_serializeOpSuspendContactRecording) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/contact/suspend-recording") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6116,13 +5746,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6204,13 +5829,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6273,13 +5893,8 @@ func (m *awsRestjson1_serializeOpUpdateContactAttributes) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/contact/attributes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6358,13 +5973,8 @@ func (m *awsRestjson1_serializeOpUpdateContactFlowContent) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/contact-flows/{InstanceId}/{ContactFlowId}/content") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6453,13 +6063,8 @@ func (m *awsRestjson1_serializeOpUpdateContactFlowName) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/contact-flows/{InstanceId}/{ContactFlowId}/name") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6553,13 +6158,8 @@ func (m *awsRestjson1_serializeOpUpdateInstanceAttribute) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/attribute/{AttributeType}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6648,13 +6248,8 @@ func (m *awsRestjson1_serializeOpUpdateInstanceStorageConfig) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/instance/{InstanceId}/storage-config/{AssociationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6749,13 +6344,8 @@ func (m *awsRestjson1_serializeOpUpdateQueueHoursOfOperation) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/queues/{InstanceId}/{QueueId}/hours-of-operation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6844,13 +6434,8 @@ func (m *awsRestjson1_serializeOpUpdateQueueMaxContacts) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/queues/{InstanceId}/{QueueId}/max-contacts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6939,13 +6524,8 @@ func (m *awsRestjson1_serializeOpUpdateQueueName) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/queues/{InstanceId}/{QueueId}/name") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7039,13 +6619,8 @@ func (m *awsRestjson1_serializeOpUpdateQueueOutboundCallerConfig) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/queues/{InstanceId}/{QueueId}/outbound-caller-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7136,13 +6711,8 @@ func (m *awsRestjson1_serializeOpUpdateQueueStatus) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/queues/{InstanceId}/{QueueId}/status") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7231,13 +6801,8 @@ func (m *awsRestjson1_serializeOpUpdateQuickConnectConfig) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/quick-connects/{InstanceId}/{QuickConnectId}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7328,13 +6893,8 @@ func (m *awsRestjson1_serializeOpUpdateQuickConnectName) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/quick-connects/{InstanceId}/{QuickConnectId}/name") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7428,13 +6988,8 @@ func (m *awsRestjson1_serializeOpUpdateRoutingProfileConcurrency) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/routing-profiles/{InstanceId}/{RoutingProfileId}/concurrency") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7525,13 +7080,8 @@ func (m *awsRestjson1_serializeOpUpdateRoutingProfileDefaultOutboundQueue) Handl } opPath, opQuery := httpbinding.SplitURI("/routing-profiles/{InstanceId}/{RoutingProfileId}/default-outbound-queue") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7620,13 +7170,8 @@ func (m *awsRestjson1_serializeOpUpdateRoutingProfileName) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/routing-profiles/{InstanceId}/{RoutingProfileId}/name") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7720,13 +7265,8 @@ func (m *awsRestjson1_serializeOpUpdateRoutingProfileQueues) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/routing-profiles/{InstanceId}/{RoutingProfileId}/queues") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7817,13 +7357,8 @@ func (m *awsRestjson1_serializeOpUpdateUserHierarchy) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/users/{InstanceId}/{UserId}/hierarchy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7912,13 +7447,8 @@ func (m *awsRestjson1_serializeOpUpdateUserHierarchyGroupName) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/user-hierarchy-groups/{InstanceId}/{HierarchyGroupId}/name") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8007,13 +7537,8 @@ func (m *awsRestjson1_serializeOpUpdateUserHierarchyStructure) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/user-hierarchy-structure/{InstanceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8095,13 +7620,8 @@ func (m *awsRestjson1_serializeOpUpdateUserIdentityInfo) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/users/{InstanceId}/{UserId}/identity-info") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8192,13 +7712,8 @@ func (m *awsRestjson1_serializeOpUpdateUserPhoneConfig) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/users/{InstanceId}/{UserId}/phone-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8289,13 +7804,8 @@ func (m *awsRestjson1_serializeOpUpdateUserRoutingProfile) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/users/{InstanceId}/{UserId}/routing-profile") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8384,13 +7894,8 @@ func (m *awsRestjson1_serializeOpUpdateUserSecurityProfiles) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/users/{InstanceId}/{UserId}/security-profiles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/connectcontactlens/go.mod b/service/connectcontactlens/go.mod index 02a2f6e6e7f..974dd135113 100644 --- a/service/connectcontactlens/go.mod +++ b/service/connectcontactlens/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/connectcontactlens/go.sum b/service/connectcontactlens/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/connectcontactlens/go.sum +++ b/service/connectcontactlens/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/connectcontactlens/serializers.go b/service/connectcontactlens/serializers.go index 7bda10246aa..79c664d26ca 100644 --- a/service/connectcontactlens/serializers.go +++ b/service/connectcontactlens/serializers.go @@ -35,13 +35,8 @@ func (m *awsRestjson1_serializeOpListRealtimeContactAnalysisSegments) HandleSeri } opPath, opQuery := httpbinding.SplitURI("/realtime-contact-analysis/analysis-segments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/connectparticipant/go.mod b/service/connectparticipant/go.mod index e3f433d7921..e34b287b06c 100644 --- a/service/connectparticipant/go.mod +++ b/service/connectparticipant/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/connectparticipant/go.sum b/service/connectparticipant/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/connectparticipant/go.sum +++ b/service/connectparticipant/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/connectparticipant/serializers.go b/service/connectparticipant/serializers.go index 7ca65ee8f36..40afd3e4883 100644 --- a/service/connectparticipant/serializers.go +++ b/service/connectparticipant/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCompleteAttachmentUpload) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/participant/complete-attachment-upload") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -125,13 +120,8 @@ func (m *awsRestjson1_serializeOpCreateParticipantConnection) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/participant/connection") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -209,13 +199,8 @@ func (m *awsRestjson1_serializeOpDisconnectParticipant) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/participant/disconnect") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -291,13 +276,8 @@ func (m *awsRestjson1_serializeOpGetAttachment) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/participant/attachment") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -373,13 +353,8 @@ func (m *awsRestjson1_serializeOpGetTranscript) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/participant/transcript") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -482,13 +457,8 @@ func (m *awsRestjson1_serializeOpSendEvent) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/participant/event") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -574,13 +544,8 @@ func (m *awsRestjson1_serializeOpSendMessage) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/participant/message") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -666,13 +631,8 @@ func (m *awsRestjson1_serializeOpStartAttachmentUpload) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/participant/start-attachment-upload") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/customerprofiles/go.mod b/service/customerprofiles/go.mod index cdd8644cbc0..e053fea5e72 100644 --- a/service/customerprofiles/go.mod +++ b/service/customerprofiles/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/customerprofiles/go.sum b/service/customerprofiles/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/customerprofiles/go.sum +++ b/service/customerprofiles/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/customerprofiles/serializers.go b/service/customerprofiles/serializers.go index 2c9f62c838d..555b3c20c0e 100644 --- a/service/customerprofiles/serializers.go +++ b/service/customerprofiles/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAddProfileKey) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/profiles/keys") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -134,13 +129,8 @@ func (m *awsRestjson1_serializeOpCreateDomain) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -237,13 +227,8 @@ func (m *awsRestjson1_serializeOpCreateProfile) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/profiles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -433,13 +418,8 @@ func (m *awsRestjson1_serializeOpDeleteDomain) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -496,13 +476,8 @@ func (m *awsRestjson1_serializeOpDeleteIntegration) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/integrations/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -582,13 +557,8 @@ func (m *awsRestjson1_serializeOpDeleteProfile) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/profiles/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -668,13 +638,8 @@ func (m *awsRestjson1_serializeOpDeleteProfileKey) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/profiles/keys/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -766,13 +731,8 @@ func (m *awsRestjson1_serializeOpDeleteProfileObject) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/profiles/objects/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -862,13 +822,8 @@ func (m *awsRestjson1_serializeOpDeleteProfileObjectType) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/object-types/{ObjectTypeName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -934,13 +889,8 @@ func (m *awsRestjson1_serializeOpGetDomain) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -997,13 +947,8 @@ func (m *awsRestjson1_serializeOpGetIntegration) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/integrations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1083,13 +1028,8 @@ func (m *awsRestjson1_serializeOpGetProfileObjectType) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/object-types/{ObjectTypeName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1155,13 +1095,8 @@ func (m *awsRestjson1_serializeOpGetProfileObjectTypeTemplate) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/templates/{TemplateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1218,13 +1153,8 @@ func (m *awsRestjson1_serializeOpListAccountIntegrations) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/integrations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1303,13 +1233,8 @@ func (m *awsRestjson1_serializeOpListDomains) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/domains") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1365,13 +1290,8 @@ func (m *awsRestjson1_serializeOpListIntegrations) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/integrations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1436,13 +1356,8 @@ func (m *awsRestjson1_serializeOpListProfileObjects) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/profiles/objects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1535,13 +1450,8 @@ func (m *awsRestjson1_serializeOpListProfileObjectTypes) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/object-types") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1606,13 +1516,8 @@ func (m *awsRestjson1_serializeOpListProfileObjectTypeTemplates) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/templates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1668,13 +1573,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1731,13 +1631,8 @@ func (m *awsRestjson1_serializeOpPutIntegration) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/integrations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1829,13 +1724,8 @@ func (m *awsRestjson1_serializeOpPutProfileObject) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/profiles/objects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1920,13 +1810,8 @@ func (m *awsRestjson1_serializeOpPutProfileObjectType) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/object-types/{ObjectTypeName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2056,13 +1941,8 @@ func (m *awsRestjson1_serializeOpSearchProfiles) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/profiles/search") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2157,13 +2037,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2245,13 +2120,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2314,13 +2184,8 @@ func (m *awsRestjson1_serializeOpUpdateDomain) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2417,13 +2282,8 @@ func (m *awsRestjson1_serializeOpUpdateProfile) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/domains/{DomainName}/profiles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/databrew/go.mod b/service/databrew/go.mod index 4530082e981..ddc96d94494 100644 --- a/service/databrew/go.mod +++ b/service/databrew/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/databrew/go.sum b/service/databrew/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/databrew/go.sum +++ b/service/databrew/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/databrew/serializers.go b/service/databrew/serializers.go index b1eca94b17d..ba52e2f15a1 100644 --- a/service/databrew/serializers.go +++ b/service/databrew/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpBatchDeleteRecipeVersion) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/recipes/{Name}/batchDeleteRecipeVersion") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -124,13 +119,8 @@ func (m *awsRestjson1_serializeOpCreateDataset) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/datasets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -223,13 +213,8 @@ func (m *awsRestjson1_serializeOpCreateProfileJob) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/profileJobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -357,13 +342,8 @@ func (m *awsRestjson1_serializeOpCreateProject) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/projects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -459,13 +439,8 @@ func (m *awsRestjson1_serializeOpCreateRecipe) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/recipes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -551,13 +526,8 @@ func (m *awsRestjson1_serializeOpCreateRecipeJob) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/recipeJobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -690,13 +660,8 @@ func (m *awsRestjson1_serializeOpCreateSchedule) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/schedules") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -782,13 +747,8 @@ func (m *awsRestjson1_serializeOpDeleteDataset) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/datasets/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -845,13 +805,8 @@ func (m *awsRestjson1_serializeOpDeleteJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/jobs/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -908,13 +863,8 @@ func (m *awsRestjson1_serializeOpDeleteProject) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/projects/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -971,13 +921,8 @@ func (m *awsRestjson1_serializeOpDeleteRecipeVersion) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/recipes/{Name}/recipeVersion/{RecipeVersion}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1043,13 +988,8 @@ func (m *awsRestjson1_serializeOpDeleteSchedule) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/schedules/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1106,13 +1046,8 @@ func (m *awsRestjson1_serializeOpDescribeDataset) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/datasets/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1169,13 +1104,8 @@ func (m *awsRestjson1_serializeOpDescribeJob) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/jobs/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1232,13 +1162,8 @@ func (m *awsRestjson1_serializeOpDescribeJobRun) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/jobs/{Name}/jobRun/{RunId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1304,13 +1229,8 @@ func (m *awsRestjson1_serializeOpDescribeProject) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/projects/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1367,13 +1287,8 @@ func (m *awsRestjson1_serializeOpDescribeRecipe) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/recipes/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1434,13 +1349,8 @@ func (m *awsRestjson1_serializeOpDescribeSchedule) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/schedules/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1497,13 +1407,8 @@ func (m *awsRestjson1_serializeOpListDatasets) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/datasets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1559,13 +1464,8 @@ func (m *awsRestjson1_serializeOpListJobRuns) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/jobs/{Name}/jobRuns") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1630,13 +1530,8 @@ func (m *awsRestjson1_serializeOpListJobs) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1700,13 +1595,8 @@ func (m *awsRestjson1_serializeOpListProjects) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/projects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1762,13 +1652,8 @@ func (m *awsRestjson1_serializeOpListRecipes) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/recipes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1828,13 +1713,8 @@ func (m *awsRestjson1_serializeOpListRecipeVersions) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/recipeVersions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1894,13 +1774,8 @@ func (m *awsRestjson1_serializeOpListSchedules) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/schedules") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1960,13 +1835,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2023,13 +1893,8 @@ func (m *awsRestjson1_serializeOpPublishRecipe) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/recipes/{Name}/publishRecipe") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2109,13 +1974,8 @@ func (m *awsRestjson1_serializeOpSendProjectSessionAction) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/projects/{Name}/sendProjectSessionAction") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2219,13 +2079,8 @@ func (m *awsRestjson1_serializeOpStartJobRun) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/jobs/{Name}/startJobRun") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2282,13 +2137,8 @@ func (m *awsRestjson1_serializeOpStartProjectSession) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/projects/{Name}/startProjectSession") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2368,13 +2218,8 @@ func (m *awsRestjson1_serializeOpStopJobRun) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/jobs/{Name}/jobRun/{RunId}/stopJobRun") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2440,13 +2285,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2528,13 +2368,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2597,13 +2432,8 @@ func (m *awsRestjson1_serializeOpUpdateDataset) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/datasets/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2697,13 +2527,8 @@ func (m *awsRestjson1_serializeOpUpdateProfileJob) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/profileJobs/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2827,13 +2652,8 @@ func (m *awsRestjson1_serializeOpUpdateProject) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/projects/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2920,13 +2740,8 @@ func (m *awsRestjson1_serializeOpUpdateRecipe) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/recipes/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3013,13 +2828,8 @@ func (m *awsRestjson1_serializeOpUpdateRecipeJob) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/recipeJobs/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3136,13 +2946,8 @@ func (m *awsRestjson1_serializeOpUpdateSchedule) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/schedules/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/dataexchange/go.mod b/service/dataexchange/go.mod index 982757b3bc5..3e76f668241 100644 --- a/service/dataexchange/go.mod +++ b/service/dataexchange/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/dataexchange/go.sum b/service/dataexchange/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/dataexchange/go.sum +++ b/service/dataexchange/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/dataexchange/serializers.go b/service/dataexchange/serializers.go index 3d46bc41ffc..76702809d4e 100644 --- a/service/dataexchange/serializers.go +++ b/service/dataexchange/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCancelJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/jobs/{JobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -99,13 +94,8 @@ func (m *awsRestjson1_serializeOpCreateDataSet) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/data-sets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -189,13 +179,8 @@ func (m *awsRestjson1_serializeOpCreateJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -269,13 +254,8 @@ func (m *awsRestjson1_serializeOpCreateRevision) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/data-sets/{DataSetId}/revisions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -362,13 +342,8 @@ func (m *awsRestjson1_serializeOpDeleteAsset) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets/{AssetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -443,13 +418,8 @@ func (m *awsRestjson1_serializeOpDeleteDataSet) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/data-sets/{DataSetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -506,13 +476,8 @@ func (m *awsRestjson1_serializeOpDeleteRevision) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/data-sets/{DataSetId}/revisions/{RevisionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -578,13 +543,8 @@ func (m *awsRestjson1_serializeOpGetAsset) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets/{AssetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -659,13 +619,8 @@ func (m *awsRestjson1_serializeOpGetDataSet) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/data-sets/{DataSetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -722,13 +677,8 @@ func (m *awsRestjson1_serializeOpGetJob) HandleSerialize(ctx context.Context, in } opPath, opQuery := httpbinding.SplitURI("/v1/jobs/{JobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -785,13 +735,8 @@ func (m *awsRestjson1_serializeOpGetRevision) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/data-sets/{DataSetId}/revisions/{RevisionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -857,13 +802,8 @@ func (m *awsRestjson1_serializeOpListDataSetRevisions) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v1/data-sets/{DataSetId}/revisions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -928,13 +868,8 @@ func (m *awsRestjson1_serializeOpListDataSets) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/data-sets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -994,13 +929,8 @@ func (m *awsRestjson1_serializeOpListJobs) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1064,13 +994,8 @@ func (m *awsRestjson1_serializeOpListRevisionAssets) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1144,13 +1069,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1207,13 +1127,8 @@ func (m *awsRestjson1_serializeOpStartJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/jobs/{JobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1270,13 +1185,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1358,13 +1268,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1427,13 +1332,8 @@ func (m *awsRestjson1_serializeOpUpdateAsset) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/data-sets/{DataSetId}/revisions/{RevisionId}/assets/{AssetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1531,13 +1431,8 @@ func (m *awsRestjson1_serializeOpUpdateDataSet) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/data-sets/{DataSetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1622,13 +1517,8 @@ func (m *awsRestjson1_serializeOpUpdateRevision) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/data-sets/{DataSetId}/revisions/{RevisionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/detective/go.mod b/service/detective/go.mod index 0d12bea4647..1a64021c728 100644 --- a/service/detective/go.mod +++ b/service/detective/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/detective/go.sum b/service/detective/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/detective/go.sum +++ b/service/detective/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/detective/serializers.go b/service/detective/serializers.go index 3ae8515cfcb..5c1e2f435b5 100644 --- a/service/detective/serializers.go +++ b/service/detective/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAcceptInvitation) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/invitation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -109,13 +104,8 @@ func (m *awsRestjson1_serializeOpCreateGraph) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/graph") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -159,13 +149,8 @@ func (m *awsRestjson1_serializeOpCreateMembers) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/graph/members") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -249,13 +234,8 @@ func (m *awsRestjson1_serializeOpDeleteGraph) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/graph/removal") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -322,13 +302,8 @@ func (m *awsRestjson1_serializeOpDeleteMembers) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/graph/members/removal") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -402,13 +377,8 @@ func (m *awsRestjson1_serializeOpDisassociateMembership) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/membership/removal") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -475,13 +445,8 @@ func (m *awsRestjson1_serializeOpGetMembers) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/graph/members/get") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -555,13 +520,8 @@ func (m *awsRestjson1_serializeOpListGraphs) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/graphs/list") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -633,13 +593,8 @@ func (m *awsRestjson1_serializeOpListInvitations) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/invitations/list") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -711,13 +666,8 @@ func (m *awsRestjson1_serializeOpListMembers) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/graph/members/list") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -794,13 +744,8 @@ func (m *awsRestjson1_serializeOpRejectInvitation) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/invitation/removal") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -867,13 +812,8 @@ func (m *awsRestjson1_serializeOpStartMonitoringMember) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/graph/member/monitoringstate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/devopsguru/go.mod b/service/devopsguru/go.mod index 59396a18721..d88c7dc4ac3 100644 --- a/service/devopsguru/go.mod +++ b/service/devopsguru/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/devopsguru/go.sum b/service/devopsguru/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/devopsguru/go.sum +++ b/service/devopsguru/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/devopsguru/serializers.go b/service/devopsguru/serializers.go index 2257e71e6e3..df7f588363f 100644 --- a/service/devopsguru/serializers.go +++ b/service/devopsguru/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpAddNotificationChannel) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/channels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -112,13 +107,8 @@ func (m *awsRestjson1_serializeOpDescribeAccountHealth) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/accounts/health") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -162,13 +152,8 @@ func (m *awsRestjson1_serializeOpDescribeAccountOverview) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/accounts/overview") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -240,13 +225,8 @@ func (m *awsRestjson1_serializeOpDescribeAnomaly) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/anomalies/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -303,13 +283,8 @@ func (m *awsRestjson1_serializeOpDescribeFeedback) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/feedback") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -376,13 +351,8 @@ func (m *awsRestjson1_serializeOpDescribeInsight) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/insights/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -439,13 +409,8 @@ func (m *awsRestjson1_serializeOpDescribeResourceCollectionHealth) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/accounts/health/resource-collection/{ResourceCollectionType}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -506,13 +471,8 @@ func (m *awsRestjson1_serializeOpDescribeServiceIntegration) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/service-integrations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -556,13 +516,8 @@ func (m *awsRestjson1_serializeOpGetResourceCollection) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/resource-collections/{ResourceCollectionType}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -623,13 +578,8 @@ func (m *awsRestjson1_serializeOpListAnomaliesForInsight) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/anomalies/insight/{InsightId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -721,13 +671,8 @@ func (m *awsRestjson1_serializeOpListEvents) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/events") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -806,13 +751,8 @@ func (m *awsRestjson1_serializeOpListInsights) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/insights") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -891,13 +831,8 @@ func (m *awsRestjson1_serializeOpListNotificationChannels) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/channels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -964,13 +899,8 @@ func (m *awsRestjson1_serializeOpListRecommendations) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/recommendations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1042,13 +972,8 @@ func (m *awsRestjson1_serializeOpPutFeedback) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/feedback") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1117,13 +1042,8 @@ func (m *awsRestjson1_serializeOpRemoveNotificationChannel) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/channels/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1180,13 +1100,8 @@ func (m *awsRestjson1_serializeOpSearchInsights) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/insights/search") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1277,13 +1192,8 @@ func (m *awsRestjson1_serializeOpUpdateResourceCollection) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/resource-collections") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1357,13 +1267,8 @@ func (m *awsRestjson1_serializeOpUpdateServiceIntegration) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/service-integrations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/dlm/go.mod b/service/dlm/go.mod index 9ea31a36786..9bd391a6a03 100644 --- a/service/dlm/go.mod +++ b/service/dlm/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/dlm/go.sum b/service/dlm/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/dlm/go.sum +++ b/service/dlm/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/dlm/serializers.go b/service/dlm/serializers.go index 4899042eaa6..079f550007b 100644 --- a/service/dlm/serializers.go +++ b/service/dlm/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateLifecyclePolicy) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/policies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -133,13 +128,8 @@ func (m *awsRestjson1_serializeOpDeleteLifecyclePolicy) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/policies/{PolicyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -196,13 +186,8 @@ func (m *awsRestjson1_serializeOpGetLifecyclePolicies) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/policies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -278,13 +263,8 @@ func (m *awsRestjson1_serializeOpGetLifecyclePolicy) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/policies/{PolicyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -341,13 +321,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -404,13 +379,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -492,13 +462,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -561,13 +526,8 @@ func (m *awsRestjson1_serializeOpUpdateLifecyclePolicy) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/policies/{PolicyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/ebs/go.mod b/service/ebs/go.mod index 34a410ff953..9e9e826ca0d 100644 --- a/service/ebs/go.mod +++ b/service/ebs/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ebs/go.sum b/service/ebs/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/ebs/go.sum +++ b/service/ebs/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ebs/serializers.go b/service/ebs/serializers.go index bab72ea0840..7923b730c25 100644 --- a/service/ebs/serializers.go +++ b/service/ebs/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCompleteSnapshot) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/snapshots/completion/{SnapshotId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -119,13 +114,8 @@ func (m *awsRestjson1_serializeOpGetSnapshotBlock) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/snapshots/{SnapshotId}/blocks/{BlockIndex}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -195,13 +185,8 @@ func (m *awsRestjson1_serializeOpListChangedBlocks) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/snapshots/{SecondSnapshotId}/changedblocks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -274,13 +259,8 @@ func (m *awsRestjson1_serializeOpListSnapshotBlocks) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/snapshots/{SnapshotId}/blocks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -349,13 +329,8 @@ func (m *awsRestjson1_serializeOpPutSnapshotBlock) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/snapshots/{SnapshotId}/blocks/{BlockIndex}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -452,13 +427,8 @@ func (m *awsRestjson1_serializeOpStartSnapshot) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/snapshots") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/efs/go.mod b/service/efs/go.mod index daab2e2e158..18ad428a794 100644 --- a/service/efs/go.mod +++ b/service/efs/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/efs/go.sum b/service/efs/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/efs/go.sum +++ b/service/efs/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/efs/serializers.go b/service/efs/serializers.go index 00a91ac14e3..b802c47b426 100644 --- a/service/efs/serializers.go +++ b/service/efs/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateAccessPoint) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/access-points") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -135,13 +130,8 @@ func (m *awsRestjson1_serializeOpCreateFileSystem) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/file-systems") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -250,13 +240,8 @@ func (m *awsRestjson1_serializeOpCreateMountTarget) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/mount-targets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -340,13 +325,8 @@ func (m *awsRestjson1_serializeOpCreateTags) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/create-tags/{FileSystemId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -428,13 +408,8 @@ func (m *awsRestjson1_serializeOpDeleteAccessPoint) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/access-points/{AccessPointId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -491,13 +466,8 @@ func (m *awsRestjson1_serializeOpDeleteFileSystem) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/file-systems/{FileSystemId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -554,13 +524,8 @@ func (m *awsRestjson1_serializeOpDeleteFileSystemPolicy) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/file-systems/{FileSystemId}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -617,13 +582,8 @@ func (m *awsRestjson1_serializeOpDeleteMountTarget) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/mount-targets/{MountTargetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -680,13 +640,8 @@ func (m *awsRestjson1_serializeOpDeleteTags) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/delete-tags/{FileSystemId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -768,13 +723,8 @@ func (m *awsRestjson1_serializeOpDescribeAccessPoints) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/access-points") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -838,13 +788,8 @@ func (m *awsRestjson1_serializeOpDescribeBackupPolicy) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/file-systems/{FileSystemId}/backup-policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -901,13 +846,8 @@ func (m *awsRestjson1_serializeOpDescribeFileSystemPolicy) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/file-systems/{FileSystemId}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -964,13 +904,8 @@ func (m *awsRestjson1_serializeOpDescribeFileSystems) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/file-systems") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1034,13 +969,8 @@ func (m *awsRestjson1_serializeOpDescribeLifecycleConfiguration) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/file-systems/{FileSystemId}/lifecycle-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1097,13 +1027,8 @@ func (m *awsRestjson1_serializeOpDescribeMountTargets) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/mount-targets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1171,13 +1096,8 @@ func (m *awsRestjson1_serializeOpDescribeMountTargetSecurityGroups) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/mount-targets/{MountTargetId}/security-groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1234,13 +1154,8 @@ func (m *awsRestjson1_serializeOpDescribeTags) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/tags/{FileSystemId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1305,13 +1220,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/resource-tags/{ResourceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1376,13 +1286,8 @@ func (m *awsRestjson1_serializeOpModifyMountTargetSecurityGroups) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/mount-targets/{MountTargetId}/security-groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1464,13 +1369,8 @@ func (m *awsRestjson1_serializeOpPutBackupPolicy) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/file-systems/{FileSystemId}/backup-policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1552,13 +1452,8 @@ func (m *awsRestjson1_serializeOpPutFileSystemPolicy) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/file-systems/{FileSystemId}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1643,13 +1538,8 @@ func (m *awsRestjson1_serializeOpPutLifecycleConfiguration) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/file-systems/{FileSystemId}/lifecycle-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1731,13 +1621,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/resource-tags/{ResourceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1819,13 +1704,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/resource-tags/{ResourceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1888,13 +1768,8 @@ func (m *awsRestjson1_serializeOpUpdateFileSystem) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2015-02-01/file-systems/{FileSystemId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/eks/go.mod b/service/eks/go.mod index e1eeb41ab79..14bcf864e97 100644 --- a/service/eks/go.mod +++ b/service/eks/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/eks/go.sum b/service/eks/go.sum index d937214c3eb..9ddcad9aa66 100644 --- a/service/eks/go.sum +++ b/service/eks/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= 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.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= diff --git a/service/eks/serializers.go b/service/eks/serializers.go index 549786b1cab..2bf3fe58bb0 100644 --- a/service/eks/serializers.go +++ b/service/eks/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAssociateEncryptionConfig) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/encryption-config/associate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -129,13 +124,8 @@ func (m *awsRestjson1_serializeOpAssociateIdentityProviderConfig) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/identity-provider-configs/associate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -229,13 +219,8 @@ func (m *awsRestjson1_serializeOpCreateAddon) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/addons") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -342,13 +327,8 @@ func (m *awsRestjson1_serializeOpCreateCluster) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/clusters") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -465,13 +445,8 @@ func (m *awsRestjson1_serializeOpCreateFargateProfile) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/fargate-profiles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -582,13 +557,8 @@ func (m *awsRestjson1_serializeOpCreateNodegroup) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/node-groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -752,13 +722,8 @@ func (m *awsRestjson1_serializeOpDeleteAddon) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/addons/{addonName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -824,13 +789,8 @@ func (m *awsRestjson1_serializeOpDeleteCluster) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/clusters/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -887,13 +847,8 @@ func (m *awsRestjson1_serializeOpDeleteFargateProfile) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/fargate-profiles/{fargateProfileName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -959,13 +914,8 @@ func (m *awsRestjson1_serializeOpDeleteNodegroup) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/node-groups/{nodegroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1031,13 +981,8 @@ func (m *awsRestjson1_serializeOpDescribeAddon) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/addons/{addonName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1103,13 +1048,8 @@ func (m *awsRestjson1_serializeOpDescribeAddonVersions) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/addons/supported-versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1173,13 +1113,8 @@ func (m *awsRestjson1_serializeOpDescribeCluster) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/clusters/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1236,13 +1171,8 @@ func (m *awsRestjson1_serializeOpDescribeFargateProfile) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/fargate-profiles/{fargateProfileName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1308,13 +1238,8 @@ func (m *awsRestjson1_serializeOpDescribeIdentityProviderConfig) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/identity-provider-configs/describe") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1396,13 +1321,8 @@ func (m *awsRestjson1_serializeOpDescribeNodegroup) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/node-groups/{nodegroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1468,13 +1388,8 @@ func (m *awsRestjson1_serializeOpDescribeUpdate) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/clusters/{name}/updates/{updateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1548,13 +1463,8 @@ func (m *awsRestjson1_serializeOpDisassociateIdentityProviderConfig) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/identity-provider-configs/disassociate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1641,13 +1551,8 @@ func (m *awsRestjson1_serializeOpListAddons) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/addons") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1712,13 +1617,8 @@ func (m *awsRestjson1_serializeOpListClusters) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/clusters") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1774,13 +1674,8 @@ func (m *awsRestjson1_serializeOpListFargateProfiles) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/fargate-profiles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1845,13 +1740,8 @@ func (m *awsRestjson1_serializeOpListIdentityProviderConfigs) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/identity-provider-configs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1916,13 +1806,8 @@ func (m *awsRestjson1_serializeOpListNodegroups) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/node-groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1987,13 +1872,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2050,13 +1930,8 @@ func (m *awsRestjson1_serializeOpListUpdates) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/clusters/{name}/updates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2129,13 +2004,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2217,13 +2087,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2286,13 +2151,8 @@ func (m *awsRestjson1_serializeOpUpdateAddon) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/addons/{addonName}/update") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2396,13 +2256,8 @@ func (m *awsRestjson1_serializeOpUpdateClusterConfig) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/clusters/{name}/update-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2496,13 +2351,8 @@ func (m *awsRestjson1_serializeOpUpdateClusterVersion) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/clusters/{name}/updates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2587,13 +2437,8 @@ func (m *awsRestjson1_serializeOpUpdateNodegroupConfig) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/node-groups/{nodegroupName}/update-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2696,13 +2541,8 @@ func (m *awsRestjson1_serializeOpUpdateNodegroupVersion) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/clusters/{clusterName}/node-groups/{nodegroupName}/update-version") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/elasticinference/go.mod b/service/elasticinference/go.mod index bcc165a3a05..0f462888771 100644 --- a/service/elasticinference/go.mod +++ b/service/elasticinference/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/elasticinference/go.sum b/service/elasticinference/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/elasticinference/go.sum +++ b/service/elasticinference/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/elasticinference/serializers.go b/service/elasticinference/serializers.go index 688a79eedcf..9edaa87c3df 100644 --- a/service/elasticinference/serializers.go +++ b/service/elasticinference/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpDescribeAcceleratorOfferings) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/describe-accelerator-offerings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -116,13 +111,8 @@ func (m *awsRestjson1_serializeOpDescribeAccelerators) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/describe-accelerators") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -208,13 +198,8 @@ func (m *awsRestjson1_serializeOpDescribeAcceleratorTypes) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/describe-accelerator-types") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -258,13 +243,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -321,13 +301,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -409,13 +384,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/elasticsearchservice/go.mod b/service/elasticsearchservice/go.mod index 83659a79449..85b0bd0009d 100644 --- a/service/elasticsearchservice/go.mod +++ b/service/elasticsearchservice/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/elasticsearchservice/go.sum b/service/elasticsearchservice/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/elasticsearchservice/go.sum +++ b/service/elasticsearchservice/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/elasticsearchservice/serializers.go b/service/elasticsearchservice/serializers.go index ef226ed083a..4d19979bc68 100644 --- a/service/elasticsearchservice/serializers.go +++ b/service/elasticsearchservice/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpAcceptInboundCrossClusterSearchConnection) Hand } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/ccs/inboundConnection/{CrossClusterSearchConnectionId}/accept") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -100,13 +95,8 @@ func (m *awsRestjson1_serializeOpAddTags) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -180,13 +170,8 @@ func (m *awsRestjson1_serializeOpAssociatePackage) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/packages/associate/{PackageID}/{DomainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -252,13 +237,8 @@ func (m *awsRestjson1_serializeOpCancelElasticsearchServiceSoftwareUpdate) Handl } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/serviceSoftwareUpdate/cancel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -325,13 +305,8 @@ func (m *awsRestjson1_serializeOpCreateElasticsearchDomain) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/domain") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -499,13 +474,8 @@ func (m *awsRestjson1_serializeOpCreateOutboundCrossClusterSearchConnection) Han } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/ccs/outboundConnection") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -586,13 +556,8 @@ func (m *awsRestjson1_serializeOpCreatePackage) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/packages") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -676,13 +641,8 @@ func (m *awsRestjson1_serializeOpDeleteElasticsearchDomain) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/domain/{DomainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -739,13 +699,8 @@ func (m *awsRestjson1_serializeOpDeleteElasticsearchServiceRole) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/role") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -789,13 +744,8 @@ func (m *awsRestjson1_serializeOpDeleteInboundCrossClusterSearchConnection) Hand } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/ccs/inboundConnection/{CrossClusterSearchConnectionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -852,13 +802,8 @@ func (m *awsRestjson1_serializeOpDeleteOutboundCrossClusterSearchConnection) Han } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/ccs/outboundConnection/{CrossClusterSearchConnectionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -915,13 +860,8 @@ func (m *awsRestjson1_serializeOpDeletePackage) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/packages/{PackageID}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -978,13 +918,8 @@ func (m *awsRestjson1_serializeOpDescribeDomainAutoTunes) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/domain/{DomainName}/autoTunes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1069,13 +1004,8 @@ func (m *awsRestjson1_serializeOpDescribeElasticsearchDomain) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/domain/{DomainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1132,13 +1062,8 @@ func (m *awsRestjson1_serializeOpDescribeElasticsearchDomainConfig) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/domain/{DomainName}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1195,13 +1120,8 @@ func (m *awsRestjson1_serializeOpDescribeElasticsearchDomains) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/domain-info") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1270,13 +1190,8 @@ func (m *awsRestjson1_serializeOpDescribeElasticsearchInstanceTypeLimits) Handle } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/instanceTypeLimits/{ElasticsearchVersion}/{InstanceType}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1346,13 +1261,8 @@ func (m *awsRestjson1_serializeOpDescribeInboundCrossClusterSearchConnections) H } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/ccs/inboundConnection/search") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1431,13 +1341,8 @@ func (m *awsRestjson1_serializeOpDescribeOutboundCrossClusterSearchConnections) } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/ccs/outboundConnection/search") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1516,13 +1421,8 @@ func (m *awsRestjson1_serializeOpDescribePackages) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/packages/describe") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1601,13 +1501,8 @@ func (m *awsRestjson1_serializeOpDescribeReservedElasticsearchInstanceOfferings) } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/reservedInstanceOfferings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1667,13 +1562,8 @@ func (m *awsRestjson1_serializeOpDescribeReservedElasticsearchInstances) HandleS } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/reservedInstances") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1733,13 +1623,8 @@ func (m *awsRestjson1_serializeOpDissociatePackage) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/packages/dissociate/{PackageID}/{DomainName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1805,13 +1690,8 @@ func (m *awsRestjson1_serializeOpGetCompatibleElasticsearchVersions) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/compatibleVersions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1863,13 +1743,8 @@ func (m *awsRestjson1_serializeOpGetPackageVersionHistory) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/packages/{PackageID}/history") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1934,13 +1809,8 @@ func (m *awsRestjson1_serializeOpGetUpgradeHistory) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/upgradeDomain/{DomainName}/history") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2005,13 +1875,8 @@ func (m *awsRestjson1_serializeOpGetUpgradeStatus) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/upgradeDomain/{DomainName}/status") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2068,13 +1933,8 @@ func (m *awsRestjson1_serializeOpListDomainNames) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/domain") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2118,13 +1978,8 @@ func (m *awsRestjson1_serializeOpListDomainsForPackage) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/packages/{PackageID}/domains") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2189,13 +2044,8 @@ func (m *awsRestjson1_serializeOpListElasticsearchInstanceTypes) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/instanceTypes/{ElasticsearchVersion}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2264,13 +2114,8 @@ func (m *awsRestjson1_serializeOpListElasticsearchVersions) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2326,13 +2171,8 @@ func (m *awsRestjson1_serializeOpListPackagesForDomain) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/domain/{DomainName}/packages") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2397,13 +2237,8 @@ func (m *awsRestjson1_serializeOpListTags) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2455,13 +2290,8 @@ func (m *awsRestjson1_serializeOpPurchaseReservedElasticsearchInstanceOffering) } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/purchaseReservedInstanceOffering") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2538,13 +2368,8 @@ func (m *awsRestjson1_serializeOpRejectInboundCrossClusterSearchConnection) Hand } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/ccs/inboundConnection/{CrossClusterSearchConnectionId}/reject") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2601,13 +2426,8 @@ func (m *awsRestjson1_serializeOpRemoveTags) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/tags-removal") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2681,13 +2501,8 @@ func (m *awsRestjson1_serializeOpStartElasticsearchServiceSoftwareUpdate) Handle } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/serviceSoftwareUpdate/start") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2754,13 +2569,8 @@ func (m *awsRestjson1_serializeOpUpdateElasticsearchDomainConfig) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/domain/{DomainName}/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2924,13 +2734,8 @@ func (m *awsRestjson1_serializeOpUpdatePackage) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/packages/update") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3014,13 +2819,8 @@ func (m *awsRestjson1_serializeOpUpgradeElasticsearchDomain) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2015-01-01/es/upgradeDomain") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/elastictranscoder/go.mod b/service/elastictranscoder/go.mod index 888675167e3..eeecf8f68b1 100644 --- a/service/elastictranscoder/go.mod +++ b/service/elastictranscoder/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/elastictranscoder/go.sum b/service/elastictranscoder/go.sum index d937214c3eb..9ddcad9aa66 100644 --- a/service/elastictranscoder/go.sum +++ b/service/elastictranscoder/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= 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.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= diff --git a/service/elastictranscoder/serializers.go b/service/elastictranscoder/serializers.go index c53ded7b53b..d773dc6e23c 100644 --- a/service/elastictranscoder/serializers.go +++ b/service/elastictranscoder/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCancelJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/jobs/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -99,13 +94,8 @@ func (m *awsRestjson1_serializeOpCreateJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -219,13 +209,8 @@ func (m *awsRestjson1_serializeOpCreatePipeline) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/pipelines") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -333,13 +318,8 @@ func (m *awsRestjson1_serializeOpCreatePreset) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/presets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -437,13 +417,8 @@ func (m *awsRestjson1_serializeOpDeletePipeline) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/pipelines/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -500,13 +475,8 @@ func (m *awsRestjson1_serializeOpDeletePreset) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/presets/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -563,13 +533,8 @@ func (m *awsRestjson1_serializeOpListJobsByPipeline) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/jobsByPipeline/{PipelineId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -634,13 +599,8 @@ func (m *awsRestjson1_serializeOpListJobsByStatus) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/jobsByStatus/{Status}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -705,13 +665,8 @@ func (m *awsRestjson1_serializeOpListPipelines) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/pipelines") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -767,13 +722,8 @@ func (m *awsRestjson1_serializeOpListPresets) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/presets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -829,13 +779,8 @@ func (m *awsRestjson1_serializeOpReadJob) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/jobs/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -892,13 +837,8 @@ func (m *awsRestjson1_serializeOpReadPipeline) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/pipelines/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -955,13 +895,8 @@ func (m *awsRestjson1_serializeOpReadPreset) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/presets/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1018,13 +953,8 @@ func (m *awsRestjson1_serializeOpTestRole) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/roleTests") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1108,13 +1038,8 @@ func (m *awsRestjson1_serializeOpUpdatePipeline) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/pipelines/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1230,13 +1155,8 @@ func (m *awsRestjson1_serializeOpUpdatePipelineNotifications) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/pipelines/{Id}/notifications") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1318,13 +1238,8 @@ func (m *awsRestjson1_serializeOpUpdatePipelineStatus) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/2012-09-25/pipelines/{Id}/status") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/emrcontainers/go.mod b/service/emrcontainers/go.mod index c600b3e5f04..dbd0bf6534b 100644 --- a/service/emrcontainers/go.mod +++ b/service/emrcontainers/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/emrcontainers/go.sum b/service/emrcontainers/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/emrcontainers/go.sum +++ b/service/emrcontainers/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/emrcontainers/serializers.go b/service/emrcontainers/serializers.go index bf60dfdf60e..32443809c5f 100644 --- a/service/emrcontainers/serializers.go +++ b/service/emrcontainers/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpCancelJobRun) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/virtualclusters/{virtualClusterId}/jobruns/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -109,13 +104,8 @@ func (m *awsRestjson1_serializeOpCreateManagedEndpoint) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/virtualclusters/{virtualClusterId}/endpoints") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -234,13 +224,8 @@ func (m *awsRestjson1_serializeOpCreateVirtualCluster) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/virtualclusters") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -326,13 +311,8 @@ func (m *awsRestjson1_serializeOpDeleteManagedEndpoint) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/virtualclusters/{virtualClusterId}/endpoints/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -398,13 +378,8 @@ func (m *awsRestjson1_serializeOpDeleteVirtualCluster) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/virtualclusters/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -461,13 +436,8 @@ func (m *awsRestjson1_serializeOpDescribeJobRun) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/virtualclusters/{virtualClusterId}/jobruns/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -533,13 +503,8 @@ func (m *awsRestjson1_serializeOpDescribeManagedEndpoint) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/virtualclusters/{virtualClusterId}/endpoints/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -605,13 +570,8 @@ func (m *awsRestjson1_serializeOpDescribeVirtualCluster) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/virtualclusters/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -668,13 +628,8 @@ func (m *awsRestjson1_serializeOpListJobRuns) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/virtualclusters/{virtualClusterId}/jobruns") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -757,13 +712,8 @@ func (m *awsRestjson1_serializeOpListManagedEndpoints) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/virtualclusters/{virtualClusterId}/endpoints") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -848,13 +798,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -911,13 +856,8 @@ func (m *awsRestjson1_serializeOpListVirtualClusters) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/virtualclusters") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -995,13 +935,8 @@ func (m *awsRestjson1_serializeOpStartJobRun) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/virtualclusters/{virtualClusterId}/jobruns") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1117,13 +1052,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1205,13 +1135,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/fis/go.mod b/service/fis/go.mod index 4050dfe9d15..b8f74ec52bb 100644 --- a/service/fis/go.mod +++ b/service/fis/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/fis/go.sum b/service/fis/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/fis/go.sum +++ b/service/fis/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/fis/serializers.go b/service/fis/serializers.go index c3b4eb67019..5113ef878e2 100644 --- a/service/fis/serializers.go +++ b/service/fis/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateExperimentTemplate) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/experimentTemplates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -147,13 +142,8 @@ func (m *awsRestjson1_serializeOpDeleteExperimentTemplate) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/experimentTemplates/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -210,13 +200,8 @@ func (m *awsRestjson1_serializeOpGetAction) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/actions/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -273,13 +258,8 @@ func (m *awsRestjson1_serializeOpGetExperiment) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/experiments/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -336,13 +316,8 @@ func (m *awsRestjson1_serializeOpGetExperimentTemplate) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/experimentTemplates/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -399,13 +374,8 @@ func (m *awsRestjson1_serializeOpListActions) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/actions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -461,13 +431,8 @@ func (m *awsRestjson1_serializeOpListExperiments) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/experiments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -523,13 +488,8 @@ func (m *awsRestjson1_serializeOpListExperimentTemplates) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/experimentTemplates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -585,13 +545,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -648,13 +603,8 @@ func (m *awsRestjson1_serializeOpStartExperiment) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/experiments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -733,13 +683,8 @@ func (m *awsRestjson1_serializeOpStopExperiment) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/experiments/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -796,13 +741,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -884,13 +824,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -953,13 +888,8 @@ func (m *awsRestjson1_serializeOpUpdateExperimentTemplate) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/experimentTemplates/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/glacier/go.mod b/service/glacier/go.mod index 3e492e7378e..87d9a1f57ce 100644 --- a/service/glacier/go.mod +++ b/service/glacier/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/glacier/go.sum b/service/glacier/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/glacier/go.sum +++ b/service/glacier/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/glacier/serializers.go b/service/glacier/serializers.go index 783d7b538d9..4e0d561193e 100644 --- a/service/glacier/serializers.go +++ b/service/glacier/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAbortMultipartUpload) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/multipart-uploads/{uploadId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -117,13 +112,8 @@ func (m *awsRestjson1_serializeOpAbortVaultLock) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/lock-policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -189,13 +179,8 @@ func (m *awsRestjson1_serializeOpAddTagsToVault) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/tags?operation=add") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -286,13 +271,8 @@ func (m *awsRestjson1_serializeOpCompleteMultipartUpload) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/multipart-uploads/{uploadId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -377,13 +357,8 @@ func (m *awsRestjson1_serializeOpCompleteVaultLock) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/lock-policy/{lockId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -458,13 +433,8 @@ func (m *awsRestjson1_serializeOpCreateVault) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -530,13 +500,8 @@ func (m *awsRestjson1_serializeOpDeleteArchive) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/archives/{archiveId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -611,13 +576,8 @@ func (m *awsRestjson1_serializeOpDeleteVault) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -683,13 +643,8 @@ func (m *awsRestjson1_serializeOpDeleteVaultAccessPolicy) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/access-policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -755,13 +710,8 @@ func (m *awsRestjson1_serializeOpDeleteVaultNotifications) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/notification-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -827,13 +777,8 @@ func (m *awsRestjson1_serializeOpDescribeJob) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/jobs/{jobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -908,13 +853,8 @@ func (m *awsRestjson1_serializeOpDescribeVault) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -980,13 +920,8 @@ func (m *awsRestjson1_serializeOpGetDataRetrievalPolicy) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/{accountId}/policies/data-retrieval") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1043,13 +978,8 @@ func (m *awsRestjson1_serializeOpGetJobOutput) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/jobs/{jobId}/output") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1129,13 +1059,8 @@ func (m *awsRestjson1_serializeOpGetVaultAccessPolicy) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/access-policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1201,13 +1126,8 @@ func (m *awsRestjson1_serializeOpGetVaultLock) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/lock-policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1273,13 +1193,8 @@ func (m *awsRestjson1_serializeOpGetVaultNotifications) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/notification-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1345,13 +1260,8 @@ func (m *awsRestjson1_serializeOpInitiateJob) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1432,13 +1342,8 @@ func (m *awsRestjson1_serializeOpInitiateMultipartUpload) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/multipart-uploads") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1514,13 +1419,8 @@ func (m *awsRestjson1_serializeOpInitiateVaultLock) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/lock-policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1601,13 +1501,8 @@ func (m *awsRestjson1_serializeOpListJobs) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1689,13 +1584,8 @@ func (m *awsRestjson1_serializeOpListMultipartUploads) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/multipart-uploads") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1769,13 +1659,8 @@ func (m *awsRestjson1_serializeOpListParts) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/multipart-uploads/{uploadId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1858,13 +1743,8 @@ func (m *awsRestjson1_serializeOpListProvisionedCapacity) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/{accountId}/provisioned-capacity") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1921,13 +1801,8 @@ func (m *awsRestjson1_serializeOpListTagsForVault) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1993,13 +1868,8 @@ func (m *awsRestjson1_serializeOpListVaults) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2064,13 +1934,8 @@ func (m *awsRestjson1_serializeOpPurchaseProvisionedCapacity) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/{accountId}/provisioned-capacity") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2127,13 +1992,8 @@ func (m *awsRestjson1_serializeOpRemoveTagsFromVault) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/tags?operation=remove") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2224,13 +2084,8 @@ func (m *awsRestjson1_serializeOpSetDataRetrievalPolicy) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/{accountId}/policies/data-retrieval") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2312,13 +2167,8 @@ func (m *awsRestjson1_serializeOpSetVaultAccessPolicy) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/access-policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2399,13 +2249,8 @@ func (m *awsRestjson1_serializeOpSetVaultNotifications) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/notification-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2486,13 +2331,8 @@ func (m *awsRestjson1_serializeOpUploadArchive) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/archives") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2579,13 +2419,8 @@ func (m *awsRestjson1_serializeOpUploadMultipartPart) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/{accountId}/vaults/{vaultName}/multipart-uploads/{uploadId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/greengrass/go.mod b/service/greengrass/go.mod index 3d1bef44e2e..063aa12fd40 100644 --- a/service/greengrass/go.mod +++ b/service/greengrass/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/greengrass/go.sum b/service/greengrass/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/greengrass/go.sum +++ b/service/greengrass/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/greengrass/serializers.go b/service/greengrass/serializers.go index d4b73fa43ca..cf607a69dc7 100644 --- a/service/greengrass/serializers.go +++ b/service/greengrass/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAssociateRoleToGroup) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}/role") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -122,13 +117,8 @@ func (m *awsRestjson1_serializeOpAssociateServiceRoleToAccount) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/greengrass/servicerole") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -195,13 +185,8 @@ func (m *awsRestjson1_serializeOpCreateConnectorDefinition) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/connectors") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -291,13 +276,8 @@ func (m *awsRestjson1_serializeOpCreateConnectorDefinitionVersion) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/connectors/{ConnectorDefinitionId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -384,13 +364,8 @@ func (m *awsRestjson1_serializeOpCreateCoreDefinition) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/cores") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -480,13 +455,8 @@ func (m *awsRestjson1_serializeOpCreateCoreDefinitionVersion) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/cores/{CoreDefinitionId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -573,13 +543,8 @@ func (m *awsRestjson1_serializeOpCreateDeployment) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}/deployments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -674,13 +639,8 @@ func (m *awsRestjson1_serializeOpCreateDeviceDefinition) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/devices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -770,13 +730,8 @@ func (m *awsRestjson1_serializeOpCreateDeviceDefinitionVersion) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/devices/{DeviceDefinitionId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -863,13 +818,8 @@ func (m *awsRestjson1_serializeOpCreateFunctionDefinition) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/functions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -959,13 +909,8 @@ func (m *awsRestjson1_serializeOpCreateFunctionDefinitionVersion) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/functions/{FunctionDefinitionId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1059,13 +1004,8 @@ func (m *awsRestjson1_serializeOpCreateGroup) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1155,13 +1095,8 @@ func (m *awsRestjson1_serializeOpCreateGroupCertificateAuthority) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}/certificateauthorities") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1223,13 +1158,8 @@ func (m *awsRestjson1_serializeOpCreateGroupVersion) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1344,13 +1274,8 @@ func (m *awsRestjson1_serializeOpCreateLoggerDefinition) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/loggers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1440,13 +1365,8 @@ func (m *awsRestjson1_serializeOpCreateLoggerDefinitionVersion) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/loggers/{LoggerDefinitionId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1533,13 +1453,8 @@ func (m *awsRestjson1_serializeOpCreateResourceDefinition) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/resources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1629,13 +1544,8 @@ func (m *awsRestjson1_serializeOpCreateResourceDefinitionVersion) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/resources/{ResourceDefinitionId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1722,13 +1632,8 @@ func (m *awsRestjson1_serializeOpCreateSoftwareUpdateJob) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/greengrass/updates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1831,13 +1736,8 @@ func (m *awsRestjson1_serializeOpCreateSubscriptionDefinition) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/subscriptions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1927,13 +1827,8 @@ func (m *awsRestjson1_serializeOpCreateSubscriptionDefinitionVersion) HandleSeri } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/subscriptions/{SubscriptionDefinitionId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2020,13 +1915,8 @@ func (m *awsRestjson1_serializeOpDeleteConnectorDefinition) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/connectors/{ConnectorDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2083,13 +1973,8 @@ func (m *awsRestjson1_serializeOpDeleteCoreDefinition) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/cores/{CoreDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2146,13 +2031,8 @@ func (m *awsRestjson1_serializeOpDeleteDeviceDefinition) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/devices/{DeviceDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2209,13 +2089,8 @@ func (m *awsRestjson1_serializeOpDeleteFunctionDefinition) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/functions/{FunctionDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2272,13 +2147,8 @@ func (m *awsRestjson1_serializeOpDeleteGroup) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2335,13 +2205,8 @@ func (m *awsRestjson1_serializeOpDeleteLoggerDefinition) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/loggers/{LoggerDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2398,13 +2263,8 @@ func (m *awsRestjson1_serializeOpDeleteResourceDefinition) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/resources/{ResourceDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2461,13 +2321,8 @@ func (m *awsRestjson1_serializeOpDeleteSubscriptionDefinition) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/subscriptions/{SubscriptionDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2524,13 +2379,8 @@ func (m *awsRestjson1_serializeOpDisassociateRoleFromGroup) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}/role") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2587,13 +2437,8 @@ func (m *awsRestjson1_serializeOpDisassociateServiceRoleFromAccount) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/greengrass/servicerole") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2637,13 +2482,8 @@ func (m *awsRestjson1_serializeOpGetAssociatedRole) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}/role") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2700,13 +2540,8 @@ func (m *awsRestjson1_serializeOpGetBulkDeploymentStatus) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/greengrass/bulk/deployments/{BulkDeploymentId}/status") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2763,13 +2598,8 @@ func (m *awsRestjson1_serializeOpGetConnectivityInfo) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/greengrass/things/{ThingName}/connectivityInfo") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2826,13 +2656,8 @@ func (m *awsRestjson1_serializeOpGetConnectorDefinition) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/connectors/{ConnectorDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2889,13 +2714,8 @@ func (m *awsRestjson1_serializeOpGetConnectorDefinitionVersion) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/connectors/{ConnectorDefinitionId}/versions/{ConnectorDefinitionVersionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2965,13 +2785,8 @@ func (m *awsRestjson1_serializeOpGetCoreDefinition) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/cores/{CoreDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3028,13 +2843,8 @@ func (m *awsRestjson1_serializeOpGetCoreDefinitionVersion) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/cores/{CoreDefinitionId}/versions/{CoreDefinitionVersionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3100,13 +2910,8 @@ func (m *awsRestjson1_serializeOpGetDeploymentStatus) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}/deployments/{DeploymentId}/status") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3172,13 +2977,8 @@ func (m *awsRestjson1_serializeOpGetDeviceDefinition) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/devices/{DeviceDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3235,13 +3035,8 @@ func (m *awsRestjson1_serializeOpGetDeviceDefinitionVersion) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/devices/{DeviceDefinitionId}/versions/{DeviceDefinitionVersionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3311,13 +3106,8 @@ func (m *awsRestjson1_serializeOpGetFunctionDefinition) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/functions/{FunctionDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3374,13 +3164,8 @@ func (m *awsRestjson1_serializeOpGetFunctionDefinitionVersion) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/functions/{FunctionDefinitionId}/versions/{FunctionDefinitionVersionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3450,13 +3235,8 @@ func (m *awsRestjson1_serializeOpGetGroup) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3513,13 +3293,8 @@ func (m *awsRestjson1_serializeOpGetGroupCertificateAuthority) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}/certificateauthorities/{CertificateAuthorityId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3585,13 +3360,8 @@ func (m *awsRestjson1_serializeOpGetGroupCertificateConfiguration) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}/certificateauthorities/configuration/expiry") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3648,13 +3418,8 @@ func (m *awsRestjson1_serializeOpGetGroupVersion) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}/versions/{GroupVersionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3720,13 +3485,8 @@ func (m *awsRestjson1_serializeOpGetLoggerDefinition) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/loggers/{LoggerDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3783,13 +3543,8 @@ func (m *awsRestjson1_serializeOpGetLoggerDefinitionVersion) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/loggers/{LoggerDefinitionId}/versions/{LoggerDefinitionVersionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3859,13 +3614,8 @@ func (m *awsRestjson1_serializeOpGetResourceDefinition) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/resources/{ResourceDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3922,13 +3672,8 @@ func (m *awsRestjson1_serializeOpGetResourceDefinitionVersion) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/resources/{ResourceDefinitionId}/versions/{ResourceDefinitionVersionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3994,13 +3739,8 @@ func (m *awsRestjson1_serializeOpGetServiceRoleForAccount) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/greengrass/servicerole") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4044,13 +3784,8 @@ func (m *awsRestjson1_serializeOpGetSubscriptionDefinition) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/subscriptions/{SubscriptionDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4107,13 +3842,8 @@ func (m *awsRestjson1_serializeOpGetSubscriptionDefinitionVersion) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/subscriptions/{SubscriptionDefinitionId}/versions/{SubscriptionDefinitionVersionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4183,13 +3913,8 @@ func (m *awsRestjson1_serializeOpGetThingRuntimeConfiguration) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/greengrass/things/{ThingName}/runtimeconfig") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4246,13 +3971,8 @@ func (m *awsRestjson1_serializeOpListBulkDeploymentDetailedReports) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/greengrass/bulk/deployments/{BulkDeploymentId}/detailed-reports") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4317,13 +4037,8 @@ func (m *awsRestjson1_serializeOpListBulkDeployments) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/greengrass/bulk/deployments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4379,13 +4094,8 @@ func (m *awsRestjson1_serializeOpListConnectorDefinitions) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/connectors") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4441,13 +4151,8 @@ func (m *awsRestjson1_serializeOpListConnectorDefinitionVersions) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/connectors/{ConnectorDefinitionId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4512,13 +4217,8 @@ func (m *awsRestjson1_serializeOpListCoreDefinitions) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/cores") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4574,13 +4274,8 @@ func (m *awsRestjson1_serializeOpListCoreDefinitionVersions) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/cores/{CoreDefinitionId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4645,13 +4340,8 @@ func (m *awsRestjson1_serializeOpListDeployments) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}/deployments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4716,13 +4406,8 @@ func (m *awsRestjson1_serializeOpListDeviceDefinitions) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/devices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4778,13 +4463,8 @@ func (m *awsRestjson1_serializeOpListDeviceDefinitionVersions) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/devices/{DeviceDefinitionId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4849,13 +4529,8 @@ func (m *awsRestjson1_serializeOpListFunctionDefinitions) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/functions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4911,13 +4586,8 @@ func (m *awsRestjson1_serializeOpListFunctionDefinitionVersions) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/functions/{FunctionDefinitionId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4982,13 +4652,8 @@ func (m *awsRestjson1_serializeOpListGroupCertificateAuthorities) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}/certificateauthorities") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5045,13 +4710,8 @@ func (m *awsRestjson1_serializeOpListGroups) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5107,13 +4767,8 @@ func (m *awsRestjson1_serializeOpListGroupVersions) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5178,13 +4833,8 @@ func (m *awsRestjson1_serializeOpListLoggerDefinitions) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/loggers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5240,13 +4890,8 @@ func (m *awsRestjson1_serializeOpListLoggerDefinitionVersions) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/loggers/{LoggerDefinitionId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5311,13 +4956,8 @@ func (m *awsRestjson1_serializeOpListResourceDefinitions) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/resources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5373,13 +5013,8 @@ func (m *awsRestjson1_serializeOpListResourceDefinitionVersions) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/resources/{ResourceDefinitionId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5444,13 +5079,8 @@ func (m *awsRestjson1_serializeOpListSubscriptionDefinitions) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/subscriptions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5506,13 +5136,8 @@ func (m *awsRestjson1_serializeOpListSubscriptionDefinitionVersions) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/subscriptions/{SubscriptionDefinitionId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5577,13 +5202,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5640,13 +5260,8 @@ func (m *awsRestjson1_serializeOpResetDeployments) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}/deployments/$reset") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5731,13 +5346,8 @@ func (m *awsRestjson1_serializeOpStartBulkDeployment) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/greengrass/bulk/deployments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5825,13 +5435,8 @@ func (m *awsRestjson1_serializeOpStopBulkDeployment) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/greengrass/bulk/deployments/{BulkDeploymentId}/$stop") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5888,13 +5493,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5976,13 +5576,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6045,13 +5640,8 @@ func (m *awsRestjson1_serializeOpUpdateConnectivityInfo) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/greengrass/things/{ThingName}/connectivityInfo") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6133,13 +5723,8 @@ func (m *awsRestjson1_serializeOpUpdateConnectorDefinition) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/connectors/{ConnectorDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6219,13 +5804,8 @@ func (m *awsRestjson1_serializeOpUpdateCoreDefinition) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/cores/{CoreDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6305,13 +5885,8 @@ func (m *awsRestjson1_serializeOpUpdateDeviceDefinition) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/devices/{DeviceDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6391,13 +5966,8 @@ func (m *awsRestjson1_serializeOpUpdateFunctionDefinition) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/functions/{FunctionDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6477,13 +6047,8 @@ func (m *awsRestjson1_serializeOpUpdateGroup) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6563,13 +6128,8 @@ func (m *awsRestjson1_serializeOpUpdateGroupCertificateConfiguration) HandleSeri } opPath, opQuery := httpbinding.SplitURI("/greengrass/groups/{GroupId}/certificateauthorities/configuration/expiry") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6649,13 +6209,8 @@ func (m *awsRestjson1_serializeOpUpdateLoggerDefinition) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/loggers/{LoggerDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6735,13 +6290,8 @@ func (m *awsRestjson1_serializeOpUpdateResourceDefinition) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/resources/{ResourceDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6821,13 +6371,8 @@ func (m *awsRestjson1_serializeOpUpdateSubscriptionDefinition) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/greengrass/definition/subscriptions/{SubscriptionDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6907,13 +6452,8 @@ func (m *awsRestjson1_serializeOpUpdateThingRuntimeConfiguration) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/greengrass/things/{ThingName}/runtimeconfig") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/greengrassv2/go.mod b/service/greengrassv2/go.mod index 9911b264bd2..ab74fc2ac2e 100644 --- a/service/greengrassv2/go.mod +++ b/service/greengrassv2/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/greengrassv2/go.sum b/service/greengrassv2/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/greengrassv2/go.sum +++ b/service/greengrassv2/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/greengrassv2/serializers.go b/service/greengrassv2/serializers.go index 5695f6459c2..2d841dcd2ae 100644 --- a/service/greengrassv2/serializers.go +++ b/service/greengrassv2/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCancelDeployment) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/deployments/{deploymentId}/cancel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -99,13 +94,8 @@ func (m *awsRestjson1_serializeOpCreateComponentVersion) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/createComponentVersion") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -186,13 +176,8 @@ func (m *awsRestjson1_serializeOpCreateDeployment) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/deployments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -292,13 +277,8 @@ func (m *awsRestjson1_serializeOpDeleteComponent) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/components/{arn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -355,13 +335,8 @@ func (m *awsRestjson1_serializeOpDeleteCoreDevice) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/coreDevices/{coreDeviceThingName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -418,13 +393,8 @@ func (m *awsRestjson1_serializeOpDescribeComponent) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/components/{arn}/metadata") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -481,13 +451,8 @@ func (m *awsRestjson1_serializeOpGetComponent) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/components/{arn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -548,13 +513,8 @@ func (m *awsRestjson1_serializeOpGetComponentVersionArtifact) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/components/{arn}/artifacts/{artifactName+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -620,13 +580,8 @@ func (m *awsRestjson1_serializeOpGetCoreDevice) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/coreDevices/{coreDeviceThingName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -683,13 +638,8 @@ func (m *awsRestjson1_serializeOpGetDeployment) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/deployments/{deploymentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -746,13 +696,8 @@ func (m *awsRestjson1_serializeOpListComponents) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/components") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -812,13 +757,8 @@ func (m *awsRestjson1_serializeOpListComponentVersions) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/components/{arn}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -883,13 +823,8 @@ func (m *awsRestjson1_serializeOpListCoreDevices) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/coreDevices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -953,13 +888,8 @@ func (m *awsRestjson1_serializeOpListDeployments) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/deployments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1023,13 +953,8 @@ func (m *awsRestjson1_serializeOpListEffectiveDeployments) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/coreDevices/{coreDeviceThingName}/effectiveDeployments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1094,13 +1019,8 @@ func (m *awsRestjson1_serializeOpListInstalledComponents) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/coreDevices/{coreDeviceThingName}/installedComponents") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1165,13 +1085,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1228,13 +1143,8 @@ func (m *awsRestjson1_serializeOpResolveComponentCandidates) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/greengrass/v2/resolveComponentCandidates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1310,13 +1220,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1398,13 +1303,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/groundstation/go.mod b/service/groundstation/go.mod index 7ac77689c8b..e3e2cf7b432 100644 --- a/service/groundstation/go.mod +++ b/service/groundstation/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/groundstation/go.sum b/service/groundstation/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/groundstation/go.sum +++ b/service/groundstation/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/groundstation/serializers.go b/service/groundstation/serializers.go index 5fa042a3e0b..f7d36018341 100644 --- a/service/groundstation/serializers.go +++ b/service/groundstation/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpCancelContact) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/contact/{contactId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -100,13 +95,8 @@ func (m *awsRestjson1_serializeOpCreateConfig) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -187,13 +177,8 @@ func (m *awsRestjson1_serializeOpCreateDataflowEndpointGroup) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/dataflowEndpointGroup") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -269,13 +254,8 @@ func (m *awsRestjson1_serializeOpCreateMissionProfile) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/missionprofile") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -376,13 +356,8 @@ func (m *awsRestjson1_serializeOpDeleteConfig) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/config/{configType}/{configId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -448,13 +423,8 @@ func (m *awsRestjson1_serializeOpDeleteDataflowEndpointGroup) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/dataflowEndpointGroup/{dataflowEndpointGroupId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -511,13 +481,8 @@ func (m *awsRestjson1_serializeOpDeleteMissionProfile) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/missionprofile/{missionProfileId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -574,13 +539,8 @@ func (m *awsRestjson1_serializeOpDescribeContact) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/contact/{contactId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -637,13 +597,8 @@ func (m *awsRestjson1_serializeOpGetConfig) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/config/{configType}/{configId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -709,13 +664,8 @@ func (m *awsRestjson1_serializeOpGetDataflowEndpointGroup) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/dataflowEndpointGroup/{dataflowEndpointGroupId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -772,13 +722,8 @@ func (m *awsRestjson1_serializeOpGetMinuteUsage) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/minute-usage") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -850,13 +795,8 @@ func (m *awsRestjson1_serializeOpGetMissionProfile) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/missionprofile/{missionProfileId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -913,13 +853,8 @@ func (m *awsRestjson1_serializeOpGetSatellite) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/satellite/{satelliteId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -976,13 +911,8 @@ func (m *awsRestjson1_serializeOpListConfigs) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1038,13 +968,8 @@ func (m *awsRestjson1_serializeOpListContacts) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/contacts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1148,13 +1073,8 @@ func (m *awsRestjson1_serializeOpListDataflowEndpointGroups) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/dataflowEndpointGroup") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1210,13 +1130,8 @@ func (m *awsRestjson1_serializeOpListGroundStations) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/groundstation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1276,13 +1191,8 @@ func (m *awsRestjson1_serializeOpListMissionProfiles) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/missionprofile") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1338,13 +1248,8 @@ func (m *awsRestjson1_serializeOpListSatellites) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/satellite") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1400,13 +1305,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1463,13 +1363,8 @@ func (m *awsRestjson1_serializeOpReserveContact) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/contact") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1563,13 +1458,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1651,13 +1541,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1720,13 +1605,8 @@ func (m *awsRestjson1_serializeOpUpdateConfig) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/config/{configType}/{configId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1822,13 +1702,8 @@ func (m *awsRestjson1_serializeOpUpdateMissionProfile) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/missionprofile/{missionProfileId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/guardduty/go.mod b/service/guardduty/go.mod index 2d5f7ff8ae2..b4f232343c4 100644 --- a/service/guardduty/go.mod +++ b/service/guardduty/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/guardduty/go.sum b/service/guardduty/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/guardduty/go.sum +++ b/service/guardduty/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/guardduty/serializers.go b/service/guardduty/serializers.go index 0b5b8153ff1..cc43b87b3d2 100644 --- a/service/guardduty/serializers.go +++ b/service/guardduty/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAcceptInvitation) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/master") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -127,13 +122,8 @@ func (m *awsRestjson1_serializeOpArchiveFindings) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/findings/archive") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -215,13 +205,8 @@ func (m *awsRestjson1_serializeOpCreateDetector) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/detector") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -312,13 +297,8 @@ func (m *awsRestjson1_serializeOpCreateFilter) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/filter") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -432,13 +412,8 @@ func (m *awsRestjson1_serializeOpCreateIPSet) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/ipset") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -545,13 +520,8 @@ func (m *awsRestjson1_serializeOpCreateMembers) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/member") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -633,13 +603,8 @@ func (m *awsRestjson1_serializeOpCreatePublishingDestination) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/publishingDestination") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -731,13 +696,8 @@ func (m *awsRestjson1_serializeOpCreateSampleFindings) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/findings/create") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -819,13 +779,8 @@ func (m *awsRestjson1_serializeOpCreateThreatIntelSet) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/threatintelset") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -932,13 +887,8 @@ func (m *awsRestjson1_serializeOpDeclineInvitations) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/invitation/decline") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1007,13 +957,8 @@ func (m *awsRestjson1_serializeOpDeleteDetector) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1070,13 +1015,8 @@ func (m *awsRestjson1_serializeOpDeleteFilter) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/filter/{FilterName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1142,13 +1082,8 @@ func (m *awsRestjson1_serializeOpDeleteInvitations) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/invitation/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1217,13 +1152,8 @@ func (m *awsRestjson1_serializeOpDeleteIPSet) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/ipset/{IpSetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1289,13 +1219,8 @@ func (m *awsRestjson1_serializeOpDeleteMembers) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/member/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1377,13 +1302,8 @@ func (m *awsRestjson1_serializeOpDeletePublishingDestination) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/publishingDestination/{DestinationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1449,13 +1369,8 @@ func (m *awsRestjson1_serializeOpDeleteThreatIntelSet) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/threatintelset/{ThreatIntelSetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1521,13 +1436,8 @@ func (m *awsRestjson1_serializeOpDescribeOrganizationConfiguration) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/admin") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1584,13 +1494,8 @@ func (m *awsRestjson1_serializeOpDescribePublishingDestination) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/publishingDestination/{DestinationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1656,13 +1561,8 @@ func (m *awsRestjson1_serializeOpDisableOrganizationAdminAccount) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/admin/disable") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1729,13 +1629,8 @@ func (m *awsRestjson1_serializeOpDisassociateFromMasterAccount) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/master/disassociate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1792,13 +1687,8 @@ func (m *awsRestjson1_serializeOpDisassociateMembers) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/member/disassociate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1880,13 +1770,8 @@ func (m *awsRestjson1_serializeOpEnableOrganizationAdminAccount) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/admin/enable") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1953,13 +1838,8 @@ func (m *awsRestjson1_serializeOpGetDetector) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2016,13 +1896,8 @@ func (m *awsRestjson1_serializeOpGetFilter) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/filter/{FilterName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2088,13 +1963,8 @@ func (m *awsRestjson1_serializeOpGetFindings) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/findings/get") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2183,13 +2053,8 @@ func (m *awsRestjson1_serializeOpGetFindingsStatistics) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/findings/statistics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2278,13 +2143,8 @@ func (m *awsRestjson1_serializeOpGetInvitationsCount) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/invitation/count") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2328,13 +2188,8 @@ func (m *awsRestjson1_serializeOpGetIPSet) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/ipset/{IpSetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2400,13 +2255,8 @@ func (m *awsRestjson1_serializeOpGetMasterAccount) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/master") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2463,13 +2313,8 @@ func (m *awsRestjson1_serializeOpGetMemberDetectors) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/member/detector/get") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2551,13 +2396,8 @@ func (m *awsRestjson1_serializeOpGetMembers) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/member/get") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2639,13 +2479,8 @@ func (m *awsRestjson1_serializeOpGetThreatIntelSet) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/threatintelset/{ThreatIntelSetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2711,13 +2546,8 @@ func (m *awsRestjson1_serializeOpGetUsageStatistics) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/usage/statistics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2819,13 +2649,8 @@ func (m *awsRestjson1_serializeOpInviteMembers) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/member/invite") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2917,13 +2742,8 @@ func (m *awsRestjson1_serializeOpListDetectors) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/detector") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2979,13 +2799,8 @@ func (m *awsRestjson1_serializeOpListFilters) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/filter") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3050,13 +2865,8 @@ func (m *awsRestjson1_serializeOpListFindings) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/findings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3155,13 +2965,8 @@ func (m *awsRestjson1_serializeOpListInvitations) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/invitation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3217,13 +3022,8 @@ func (m *awsRestjson1_serializeOpListIPSets) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/ipset") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3288,13 +3088,8 @@ func (m *awsRestjson1_serializeOpListMembers) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/member") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3363,13 +3158,8 @@ func (m *awsRestjson1_serializeOpListOrganizationAdminAccounts) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/admin") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3425,13 +3215,8 @@ func (m *awsRestjson1_serializeOpListPublishingDestinations) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/publishingDestination") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3496,13 +3281,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3559,13 +3339,8 @@ func (m *awsRestjson1_serializeOpListThreatIntelSets) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/threatintelset") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3630,13 +3405,8 @@ func (m *awsRestjson1_serializeOpStartMonitoringMembers) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/member/start") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3718,13 +3488,8 @@ func (m *awsRestjson1_serializeOpStopMonitoringMembers) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/member/stop") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3806,13 +3571,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3894,13 +3654,8 @@ func (m *awsRestjson1_serializeOpUnarchiveFindings) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/findings/unarchive") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3982,13 +3737,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4051,13 +3801,8 @@ func (m *awsRestjson1_serializeOpUpdateDetector) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4149,13 +3894,8 @@ func (m *awsRestjson1_serializeOpUpdateFilter) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/filter/{FilterName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4261,13 +4001,8 @@ func (m *awsRestjson1_serializeOpUpdateFindingsFeedback) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/findings/feedback") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4359,13 +4094,8 @@ func (m *awsRestjson1_serializeOpUpdateIPSet) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/ipset/{IpSetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4464,13 +4194,8 @@ func (m *awsRestjson1_serializeOpUpdateMemberDetectors) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/member/detector/update") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4559,13 +4284,8 @@ func (m *awsRestjson1_serializeOpUpdateOrganizationConfiguration) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/admin") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4652,13 +4372,8 @@ func (m *awsRestjson1_serializeOpUpdatePublishingDestination) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/publishingDestination/{DestinationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4749,13 +4464,8 @@ func (m *awsRestjson1_serializeOpUpdateThreatIntelSet) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/detector/{DetectorId}/threatintelset/{ThreatIntelSetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/honeycode/go.mod b/service/honeycode/go.mod index 85db4d29190..9719b628f64 100644 --- a/service/honeycode/go.mod +++ b/service/honeycode/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/honeycode/go.sum b/service/honeycode/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/honeycode/go.sum +++ b/service/honeycode/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/honeycode/serializers.go b/service/honeycode/serializers.go index 3eb720704a9..d0daa7f6f31 100644 --- a/service/honeycode/serializers.go +++ b/service/honeycode/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpBatchCreateTableRows) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/workbooks/{workbookId}/tables/{tableId}/rows/batchcreate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -138,13 +133,8 @@ func (m *awsRestjson1_serializeOpBatchDeleteTableRows) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/workbooks/{workbookId}/tables/{tableId}/rows/batchdelete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -240,13 +230,8 @@ func (m *awsRestjson1_serializeOpBatchUpdateTableRows) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/workbooks/{workbookId}/tables/{tableId}/rows/batchupdate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -342,13 +327,8 @@ func (m *awsRestjson1_serializeOpBatchUpsertTableRows) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/workbooks/{workbookId}/tables/{tableId}/rows/batchupsert") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -444,13 +424,8 @@ func (m *awsRestjson1_serializeOpDescribeTableDataImportJob) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/workbooks/{workbookId}/tables/{tableId}/import/{jobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -525,13 +500,8 @@ func (m *awsRestjson1_serializeOpGetScreenData) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/screendata") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -625,13 +595,8 @@ func (m *awsRestjson1_serializeOpInvokeScreenAutomation) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/workbooks/{workbookId}/apps/{appId}/screens/{screenId}/automations/{screenAutomationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -750,13 +715,8 @@ func (m *awsRestjson1_serializeOpListTableColumns) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/workbooks/{workbookId}/tables/{tableId}/columns") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -826,13 +786,8 @@ func (m *awsRestjson1_serializeOpListTableRows) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/workbooks/{workbookId}/tables/{tableId}/rows/list") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -933,13 +888,8 @@ func (m *awsRestjson1_serializeOpListTables) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/workbooks/{workbookId}/tables") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1004,13 +954,8 @@ func (m *awsRestjson1_serializeOpQueryTableRows) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/workbooks/{workbookId}/tables/{tableId}/rows/query") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1111,13 +1056,8 @@ func (m *awsRestjson1_serializeOpStartTableDataImportJob) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/workbooks/{workbookId}/tables/{destinationTableId}/import") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/imagebuilder/go.mod b/service/imagebuilder/go.mod index 01da9caf8d2..78c8a82d423 100644 --- a/service/imagebuilder/go.mod +++ b/service/imagebuilder/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/imagebuilder/go.sum b/service/imagebuilder/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/imagebuilder/go.sum +++ b/service/imagebuilder/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/imagebuilder/serializers.go b/service/imagebuilder/serializers.go index 5277bd73c87..bda825e0a84 100644 --- a/service/imagebuilder/serializers.go +++ b/service/imagebuilder/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCancelImageCreation) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/CancelImageCreation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -114,13 +109,8 @@ func (m *awsRestjson1_serializeOpCreateComponent) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/CreateComponent") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -241,13 +231,8 @@ func (m *awsRestjson1_serializeOpCreateContainerRecipe) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/CreateContainerRecipe") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -390,13 +375,8 @@ func (m *awsRestjson1_serializeOpCreateDistributionConfiguration) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/CreateDistributionConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -487,13 +467,8 @@ func (m *awsRestjson1_serializeOpCreateImage) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/CreateImage") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -599,13 +574,8 @@ func (m *awsRestjson1_serializeOpCreateImagePipeline) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/CreateImagePipeline") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -733,13 +703,8 @@ func (m *awsRestjson1_serializeOpCreateImageRecipe) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/CreateImageRecipe") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -852,13 +817,8 @@ func (m *awsRestjson1_serializeOpCreateInfrastructureConfiguration) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/CreateInfrastructureConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -995,13 +955,8 @@ func (m *awsRestjson1_serializeOpDeleteComponent) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/DeleteComponent") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1053,13 +1008,8 @@ func (m *awsRestjson1_serializeOpDeleteContainerRecipe) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/DeleteContainerRecipe") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1111,13 +1061,8 @@ func (m *awsRestjson1_serializeOpDeleteDistributionConfiguration) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/DeleteDistributionConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1169,13 +1114,8 @@ func (m *awsRestjson1_serializeOpDeleteImage) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/DeleteImage") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1227,13 +1167,8 @@ func (m *awsRestjson1_serializeOpDeleteImagePipeline) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/DeleteImagePipeline") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1285,13 +1220,8 @@ func (m *awsRestjson1_serializeOpDeleteImageRecipe) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/DeleteImageRecipe") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1343,13 +1273,8 @@ func (m *awsRestjson1_serializeOpDeleteInfrastructureConfiguration) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/DeleteInfrastructureConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1401,13 +1326,8 @@ func (m *awsRestjson1_serializeOpGetComponent) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/GetComponent") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1459,13 +1379,8 @@ func (m *awsRestjson1_serializeOpGetComponentPolicy) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/GetComponentPolicy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1517,13 +1432,8 @@ func (m *awsRestjson1_serializeOpGetContainerRecipe) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/GetContainerRecipe") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1575,13 +1485,8 @@ func (m *awsRestjson1_serializeOpGetContainerRecipePolicy) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/GetContainerRecipePolicy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1633,13 +1538,8 @@ func (m *awsRestjson1_serializeOpGetDistributionConfiguration) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/GetDistributionConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1691,13 +1591,8 @@ func (m *awsRestjson1_serializeOpGetImage) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/GetImage") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1749,13 +1644,8 @@ func (m *awsRestjson1_serializeOpGetImagePipeline) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/GetImagePipeline") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1807,13 +1697,8 @@ func (m *awsRestjson1_serializeOpGetImagePolicy) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/GetImagePolicy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1865,13 +1750,8 @@ func (m *awsRestjson1_serializeOpGetImageRecipe) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/GetImageRecipe") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1923,13 +1803,8 @@ func (m *awsRestjson1_serializeOpGetImageRecipePolicy) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/GetImageRecipePolicy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1981,13 +1856,8 @@ func (m *awsRestjson1_serializeOpGetInfrastructureConfiguration) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/GetInfrastructureConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2039,13 +1909,8 @@ func (m *awsRestjson1_serializeOpImportComponent) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/ImportComponent") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2169,13 +2034,8 @@ func (m *awsRestjson1_serializeOpListComponentBuildVersions) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/ListComponentBuildVersions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2252,13 +2112,8 @@ func (m *awsRestjson1_serializeOpListComponents) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/ListComponents") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2347,13 +2202,8 @@ func (m *awsRestjson1_serializeOpListContainerRecipes) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/ListContainerRecipes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2437,13 +2287,8 @@ func (m *awsRestjson1_serializeOpListDistributionConfigurations) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/ListDistributionConfigurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2522,13 +2367,8 @@ func (m *awsRestjson1_serializeOpListImageBuildVersions) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/ListImageBuildVersions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2612,13 +2452,8 @@ func (m *awsRestjson1_serializeOpListImagePackages) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/ListImagePackages") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2695,13 +2530,8 @@ func (m *awsRestjson1_serializeOpListImagePipelineImages) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/ListImagePipelineImages") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2785,13 +2615,8 @@ func (m *awsRestjson1_serializeOpListImagePipelines) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/ListImagePipelines") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2870,13 +2695,8 @@ func (m *awsRestjson1_serializeOpListImageRecipes) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/ListImageRecipes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2960,13 +2780,8 @@ func (m *awsRestjson1_serializeOpListImages) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/ListImages") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3060,13 +2875,8 @@ func (m *awsRestjson1_serializeOpListInfrastructureConfigurations) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/ListInfrastructureConfigurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3145,13 +2955,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3208,13 +3013,8 @@ func (m *awsRestjson1_serializeOpPutComponentPolicy) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/PutComponentPolicy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3286,13 +3086,8 @@ func (m *awsRestjson1_serializeOpPutContainerRecipePolicy) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/PutContainerRecipePolicy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3364,13 +3159,8 @@ func (m *awsRestjson1_serializeOpPutImagePolicy) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/PutImagePolicy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3442,13 +3232,8 @@ func (m *awsRestjson1_serializeOpPutImageRecipePolicy) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/PutImageRecipePolicy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3520,13 +3305,8 @@ func (m *awsRestjson1_serializeOpStartImagePipelineExecution) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/StartImagePipelineExecution") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3598,13 +3378,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3686,13 +3461,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3755,13 +3525,8 @@ func (m *awsRestjson1_serializeOpUpdateDistributionConfiguration) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/UpdateDistributionConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3845,13 +3610,8 @@ func (m *awsRestjson1_serializeOpUpdateImagePipeline) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/UpdateImagePipeline") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3972,13 +3732,8 @@ func (m *awsRestjson1_serializeOpUpdateInfrastructureConfiguration) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/UpdateInfrastructureConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/iot/go.mod b/service/iot/go.mod index 2cc2e24d767..b1a2d9ca3ed 100644 --- a/service/iot/go.mod +++ b/service/iot/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iot/go.sum b/service/iot/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/iot/go.sum +++ b/service/iot/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iot/serializers.go b/service/iot/serializers.go index d73fcbb5bee..ef8effd9297 100644 --- a/service/iot/serializers.go +++ b/service/iot/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpAcceptCertificateTransfer) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/accept-certificate-transfer/{certificateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -104,13 +99,8 @@ func (m *awsRestjson1_serializeOpAddThingToBillingGroup) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/billing-groups/addThingToBillingGroup") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -192,13 +182,8 @@ func (m *awsRestjson1_serializeOpAddThingToThingGroup) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/thing-groups/addThingToThingGroup") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -285,13 +270,8 @@ func (m *awsRestjson1_serializeOpAssociateTargetsWithJob) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/jobs/{jobId}/targets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -382,13 +362,8 @@ func (m *awsRestjson1_serializeOpAttachPolicy) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/target-policies/{policyName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -468,13 +443,8 @@ func (m *awsRestjson1_serializeOpAttachPrincipalPolicy) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/principal-policies/{policyName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -536,13 +506,8 @@ func (m *awsRestjson1_serializeOpAttachSecurityProfile) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/security-profiles/{securityProfileName}/targets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -603,13 +568,8 @@ func (m *awsRestjson1_serializeOpAttachThingPrincipal) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}/principals") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -671,13 +631,8 @@ func (m *awsRestjson1_serializeOpCancelAuditMitigationActionsTask) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/audit/mitigationactions/tasks/{taskId}/cancel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -734,13 +689,8 @@ func (m *awsRestjson1_serializeOpCancelAuditTask) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/audit/tasks/{taskId}/cancel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -797,13 +747,8 @@ func (m *awsRestjson1_serializeOpCancelCertificateTransfer) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/cancel-certificate-transfer/{certificateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -860,13 +805,8 @@ func (m *awsRestjson1_serializeOpCancelDetectMitigationActionsTask) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/detect/mitigationactions/tasks/{taskId}/cancel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -923,13 +863,8 @@ func (m *awsRestjson1_serializeOpCancelJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/jobs/{jobId}/cancel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1018,13 +953,8 @@ func (m *awsRestjson1_serializeOpCancelJobExecution) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}/jobs/{jobId}/cancel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1124,13 +1054,8 @@ func (m *awsRestjson1_serializeOpClearDefaultAuthorizer) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/default-authorizer") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1174,13 +1099,8 @@ func (m *awsRestjson1_serializeOpConfirmTopicRuleDestination) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/confirmdestination/{confirmationToken+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1237,13 +1157,8 @@ func (m *awsRestjson1_serializeOpCreateAuditSuppression) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/audit/suppressions/create") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1337,13 +1252,8 @@ func (m *awsRestjson1_serializeOpCreateAuthorizer) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/authorizer/{authorizerName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1452,13 +1362,8 @@ func (m *awsRestjson1_serializeOpCreateBillingGroup) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/billing-groups/{billingGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1547,13 +1452,8 @@ func (m *awsRestjson1_serializeOpCreateCertificateFromCsr) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/certificates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1628,13 +1528,8 @@ func (m *awsRestjson1_serializeOpCreateCustomMetric) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/custom-metric/{metricName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1731,13 +1626,8 @@ func (m *awsRestjson1_serializeOpCreateDimension) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/dimensions/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1836,13 +1726,8 @@ func (m *awsRestjson1_serializeOpCreateDomainConfiguration) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/domainConfigurations/{domainConfigurationName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1953,13 +1838,8 @@ func (m *awsRestjson1_serializeOpCreateDynamicThingGroup) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/dynamic-thing-groups/{thingGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2063,13 +1943,8 @@ func (m *awsRestjson1_serializeOpCreateJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/jobs/{jobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2211,13 +2086,8 @@ func (m *awsRestjson1_serializeOpCreateKeysAndCertificate) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/keys-and-certificate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2269,13 +2139,8 @@ func (m *awsRestjson1_serializeOpCreateMitigationAction) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/mitigationactions/actions/{actionName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2369,13 +2234,8 @@ func (m *awsRestjson1_serializeOpCreateOTAUpdate) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/otaUpdates/{otaUpdateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2528,13 +2388,8 @@ func (m *awsRestjson1_serializeOpCreatePolicy) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/policies/{policyName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2621,13 +2476,8 @@ func (m *awsRestjson1_serializeOpCreatePolicyVersion) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/policies/{policyName}/version") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2711,13 +2561,8 @@ func (m *awsRestjson1_serializeOpCreateProvisioningClaim) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/provisioning-templates/{templateName}/provisioning-claim") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2774,13 +2619,8 @@ func (m *awsRestjson1_serializeOpCreateProvisioningTemplate) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/provisioning-templates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2881,13 +2721,8 @@ func (m *awsRestjson1_serializeOpCreateProvisioningTemplateVersion) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/provisioning-templates/{templateName}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2971,13 +2806,8 @@ func (m *awsRestjson1_serializeOpCreateRoleAlias) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/role-aliases/{roleAlias}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3069,13 +2899,8 @@ func (m *awsRestjson1_serializeOpCreateScheduledAudit) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/audit/scheduledaudits/{scheduledAuditName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3179,13 +3004,8 @@ func (m *awsRestjson1_serializeOpCreateSecurityProfile) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/security-profiles/{securityProfileName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3300,13 +3120,8 @@ func (m *awsRestjson1_serializeOpCreateStream) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/streams/{streamId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3405,13 +3220,8 @@ func (m *awsRestjson1_serializeOpCreateThing) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3503,13 +3313,8 @@ func (m *awsRestjson1_serializeOpCreateThingGroup) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/thing-groups/{thingGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3603,13 +3408,8 @@ func (m *awsRestjson1_serializeOpCreateThingType) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/thing-types/{thingTypeName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3698,13 +3498,8 @@ func (m *awsRestjson1_serializeOpCreateTopicRule) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/rules/{ruleName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3781,13 +3576,8 @@ func (m *awsRestjson1_serializeOpCreateTopicRuleDestination) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/destinations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3856,13 +3646,8 @@ func (m *awsRestjson1_serializeOpDeleteAccountAuditConfiguration) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/audit/configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3914,13 +3699,8 @@ func (m *awsRestjson1_serializeOpDeleteAuditSuppression) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/audit/suppressions/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3994,13 +3774,8 @@ func (m *awsRestjson1_serializeOpDeleteAuthorizer) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/authorizer/{authorizerName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4057,13 +3832,8 @@ func (m *awsRestjson1_serializeOpDeleteBillingGroup) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/billing-groups/{billingGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4124,13 +3894,8 @@ func (m *awsRestjson1_serializeOpDeleteCACertificate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/cacertificate/{certificateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4187,13 +3952,8 @@ func (m *awsRestjson1_serializeOpDeleteCertificate) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/certificates/{certificateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4254,13 +4014,8 @@ func (m *awsRestjson1_serializeOpDeleteCustomMetric) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/custom-metric/{metricName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4317,13 +4072,8 @@ func (m *awsRestjson1_serializeOpDeleteDimension) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/dimensions/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4380,13 +4130,8 @@ func (m *awsRestjson1_serializeOpDeleteDomainConfiguration) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/domainConfigurations/{domainConfigurationName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4443,13 +4188,8 @@ func (m *awsRestjson1_serializeOpDeleteDynamicThingGroup) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/dynamic-thing-groups/{thingGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4510,13 +4250,8 @@ func (m *awsRestjson1_serializeOpDeleteJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/jobs/{jobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4581,13 +4316,8 @@ func (m *awsRestjson1_serializeOpDeleteJobExecution) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}/jobs/{jobId}/executionNumber/{executionNumber}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4670,13 +4400,8 @@ func (m *awsRestjson1_serializeOpDeleteMitigationAction) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/mitigationactions/actions/{actionName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4733,13 +4458,8 @@ func (m *awsRestjson1_serializeOpDeleteOTAUpdate) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/otaUpdates/{otaUpdateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4804,13 +4524,8 @@ func (m *awsRestjson1_serializeOpDeletePolicy) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/policies/{policyName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4867,13 +4582,8 @@ func (m *awsRestjson1_serializeOpDeletePolicyVersion) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/policies/{policyName}/version/{policyVersionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4939,13 +4649,8 @@ func (m *awsRestjson1_serializeOpDeleteProvisioningTemplate) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/provisioning-templates/{templateName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5002,13 +4707,8 @@ func (m *awsRestjson1_serializeOpDeleteProvisioningTemplateVersion) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/provisioning-templates/{templateName}/versions/{versionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5074,13 +4774,8 @@ func (m *awsRestjson1_serializeOpDeleteRegistrationCode) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/registrationcode") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5124,13 +4819,8 @@ func (m *awsRestjson1_serializeOpDeleteRoleAlias) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/role-aliases/{roleAlias}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5187,13 +4877,8 @@ func (m *awsRestjson1_serializeOpDeleteScheduledAudit) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/audit/scheduledaudits/{scheduledAuditName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5250,13 +4935,8 @@ func (m *awsRestjson1_serializeOpDeleteSecurityProfile) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/security-profiles/{securityProfileName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5317,13 +4997,8 @@ func (m *awsRestjson1_serializeOpDeleteStream) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/streams/{streamId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5380,13 +5055,8 @@ func (m *awsRestjson1_serializeOpDeleteThing) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5447,13 +5117,8 @@ func (m *awsRestjson1_serializeOpDeleteThingGroup) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/thing-groups/{thingGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5514,13 +5179,8 @@ func (m *awsRestjson1_serializeOpDeleteThingType) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/thing-types/{thingTypeName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5577,13 +5237,8 @@ func (m *awsRestjson1_serializeOpDeleteTopicRule) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/rules/{ruleName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5640,13 +5295,8 @@ func (m *awsRestjson1_serializeOpDeleteTopicRuleDestination) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/destinations/{arn+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5703,13 +5353,8 @@ func (m *awsRestjson1_serializeOpDeleteV2LoggingLevel) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v2LoggingLevel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5765,13 +5410,8 @@ func (m *awsRestjson1_serializeOpDeprecateThingType) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/thing-types/{thingTypeName}/deprecate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5851,13 +5491,8 @@ func (m *awsRestjson1_serializeOpDescribeAccountAuditConfiguration) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/audit/configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5901,13 +5536,8 @@ func (m *awsRestjson1_serializeOpDescribeAuditFinding) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/audit/findings/{findingId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5964,13 +5594,8 @@ func (m *awsRestjson1_serializeOpDescribeAuditMitigationActionsTask) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/audit/mitigationactions/tasks/{taskId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6027,13 +5652,8 @@ func (m *awsRestjson1_serializeOpDescribeAuditSuppression) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/audit/suppressions/describe") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6107,13 +5727,8 @@ func (m *awsRestjson1_serializeOpDescribeAuditTask) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/audit/tasks/{taskId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6170,13 +5785,8 @@ func (m *awsRestjson1_serializeOpDescribeAuthorizer) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/authorizer/{authorizerName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6233,13 +5843,8 @@ func (m *awsRestjson1_serializeOpDescribeBillingGroup) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/billing-groups/{billingGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6296,13 +5901,8 @@ func (m *awsRestjson1_serializeOpDescribeCACertificate) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/cacertificate/{certificateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6359,13 +5959,8 @@ func (m *awsRestjson1_serializeOpDescribeCertificate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/certificates/{certificateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6422,13 +6017,8 @@ func (m *awsRestjson1_serializeOpDescribeCustomMetric) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/custom-metric/{metricName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6485,13 +6075,8 @@ func (m *awsRestjson1_serializeOpDescribeDefaultAuthorizer) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/default-authorizer") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6535,13 +6120,8 @@ func (m *awsRestjson1_serializeOpDescribeDetectMitigationActionsTask) HandleSeri } opPath, opQuery := httpbinding.SplitURI("/detect/mitigationactions/tasks/{taskId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6598,13 +6178,8 @@ func (m *awsRestjson1_serializeOpDescribeDimension) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/dimensions/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6661,13 +6236,8 @@ func (m *awsRestjson1_serializeOpDescribeDomainConfiguration) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/domainConfigurations/{domainConfigurationName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6724,13 +6294,8 @@ func (m *awsRestjson1_serializeOpDescribeEndpoint) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/endpoint") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6782,13 +6347,8 @@ func (m *awsRestjson1_serializeOpDescribeEventConfigurations) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/event-configurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6832,13 +6392,8 @@ func (m *awsRestjson1_serializeOpDescribeIndex) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/indices/{indexName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6895,13 +6450,8 @@ func (m *awsRestjson1_serializeOpDescribeJob) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/jobs/{jobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6958,13 +6508,8 @@ func (m *awsRestjson1_serializeOpDescribeJobExecution) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}/jobs/{jobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7034,13 +6579,8 @@ func (m *awsRestjson1_serializeOpDescribeMitigationAction) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/mitigationactions/actions/{actionName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7097,13 +6637,8 @@ func (m *awsRestjson1_serializeOpDescribeProvisioningTemplate) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/provisioning-templates/{templateName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7160,13 +6695,8 @@ func (m *awsRestjson1_serializeOpDescribeProvisioningTemplateVersion) HandleSeri } opPath, opQuery := httpbinding.SplitURI("/provisioning-templates/{templateName}/versions/{versionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7232,13 +6762,8 @@ func (m *awsRestjson1_serializeOpDescribeRoleAlias) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/role-aliases/{roleAlias}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7295,13 +6820,8 @@ func (m *awsRestjson1_serializeOpDescribeScheduledAudit) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/audit/scheduledaudits/{scheduledAuditName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7358,13 +6878,8 @@ func (m *awsRestjson1_serializeOpDescribeSecurityProfile) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/security-profiles/{securityProfileName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7421,13 +6936,8 @@ func (m *awsRestjson1_serializeOpDescribeStream) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/streams/{streamId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7484,13 +6994,8 @@ func (m *awsRestjson1_serializeOpDescribeThing) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7547,13 +7052,8 @@ func (m *awsRestjson1_serializeOpDescribeThingGroup) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/thing-groups/{thingGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7610,13 +7110,8 @@ func (m *awsRestjson1_serializeOpDescribeThingRegistrationTask) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/thing-registration-tasks/{taskId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7673,13 +7168,8 @@ func (m *awsRestjson1_serializeOpDescribeThingType) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/thing-types/{thingTypeName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7736,13 +7226,8 @@ func (m *awsRestjson1_serializeOpDetachPolicy) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/target-policies/{policyName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7822,13 +7307,8 @@ func (m *awsRestjson1_serializeOpDetachPrincipalPolicy) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/principal-policies/{policyName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7890,13 +7370,8 @@ func (m *awsRestjson1_serializeOpDetachSecurityProfile) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/security-profiles/{securityProfileName}/targets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7957,13 +7432,8 @@ func (m *awsRestjson1_serializeOpDetachThingPrincipal) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}/principals") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8025,13 +7495,8 @@ func (m *awsRestjson1_serializeOpDisableTopicRule) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/rules/{ruleName}/disable") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8088,13 +7553,8 @@ func (m *awsRestjson1_serializeOpEnableTopicRule) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/rules/{ruleName}/enable") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8151,13 +7611,8 @@ func (m *awsRestjson1_serializeOpGetBehaviorModelTrainingSummaries) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/behavior-model-training/summaries") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8217,13 +7672,8 @@ func (m *awsRestjson1_serializeOpGetCardinality) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/indices/cardinality") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8305,13 +7755,8 @@ func (m *awsRestjson1_serializeOpGetEffectivePolicies) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/effective-policies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8391,13 +7836,8 @@ func (m *awsRestjson1_serializeOpGetIndexingConfiguration) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/indexing/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8441,13 +7881,8 @@ func (m *awsRestjson1_serializeOpGetJobDocument) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/jobs/{jobId}/job-document") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8504,13 +7939,8 @@ func (m *awsRestjson1_serializeOpGetLoggingOptions) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/loggingOptions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8554,13 +7984,8 @@ func (m *awsRestjson1_serializeOpGetOTAUpdate) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/otaUpdates/{otaUpdateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8617,13 +8042,8 @@ func (m *awsRestjson1_serializeOpGetPercentiles) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/indices/percentiles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8712,13 +8132,8 @@ func (m *awsRestjson1_serializeOpGetPolicy) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/policies/{policyName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8775,13 +8190,8 @@ func (m *awsRestjson1_serializeOpGetPolicyVersion) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/policies/{policyName}/version/{policyVersionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8847,13 +8257,8 @@ func (m *awsRestjson1_serializeOpGetRegistrationCode) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/registrationcode") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8897,13 +8302,8 @@ func (m *awsRestjson1_serializeOpGetStatistics) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/indices/statistics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8985,13 +8385,8 @@ func (m *awsRestjson1_serializeOpGetTopicRule) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/rules/{ruleName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9048,13 +8443,8 @@ func (m *awsRestjson1_serializeOpGetTopicRuleDestination) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/destinations/{arn+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9111,13 +8501,8 @@ func (m *awsRestjson1_serializeOpGetV2LoggingOptions) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2LoggingOptions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9161,13 +8546,8 @@ func (m *awsRestjson1_serializeOpListActiveViolations) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/active-violations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9239,13 +8619,8 @@ func (m *awsRestjson1_serializeOpListAttachedPolicies) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/attached-policies/{target}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9314,13 +8689,8 @@ func (m *awsRestjson1_serializeOpListAuditFindings) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/audit/findings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9424,13 +8794,8 @@ func (m *awsRestjson1_serializeOpListAuditMitigationActionsExecutions) HandleSer } opPath, opQuery := httpbinding.SplitURI("/audit/mitigationactions/executions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9498,13 +8863,8 @@ func (m *awsRestjson1_serializeOpListAuditMitigationActionsTasks) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/audit/mitigationactions/tasks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9580,13 +8940,8 @@ func (m *awsRestjson1_serializeOpListAuditSuppressions) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/audit/suppressions/list") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9675,13 +9030,8 @@ func (m *awsRestjson1_serializeOpListAuditTasks) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/audit/tasks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9753,13 +9103,8 @@ func (m *awsRestjson1_serializeOpListAuthorizers) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/authorizers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9823,13 +9168,8 @@ func (m *awsRestjson1_serializeOpListBillingGroups) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/billing-groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9889,13 +9229,8 @@ func (m *awsRestjson1_serializeOpListCACertificates) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/cacertificates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -9955,13 +9290,8 @@ func (m *awsRestjson1_serializeOpListCertificates) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/certificates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10021,13 +9351,8 @@ func (m *awsRestjson1_serializeOpListCertificatesByCA) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/certificates-by-ca/{caCertificateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10096,13 +9421,8 @@ func (m *awsRestjson1_serializeOpListCustomMetrics) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/custom-metrics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10158,13 +9478,8 @@ func (m *awsRestjson1_serializeOpListDetectMitigationActionsExecutions) HandleSe } opPath, opQuery := httpbinding.SplitURI("/detect/mitigationactions/executions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10240,13 +9555,8 @@ func (m *awsRestjson1_serializeOpListDetectMitigationActionsTasks) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/detect/mitigationactions/tasks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10310,13 +9620,8 @@ func (m *awsRestjson1_serializeOpListDimensions) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/dimensions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10372,13 +9677,8 @@ func (m *awsRestjson1_serializeOpListDomainConfigurations) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/domainConfigurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10438,13 +9738,8 @@ func (m *awsRestjson1_serializeOpListIndices) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/indices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10500,13 +9795,8 @@ func (m *awsRestjson1_serializeOpListJobExecutionsForJob) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/jobs/{jobId}/things") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10575,13 +9865,8 @@ func (m *awsRestjson1_serializeOpListJobExecutionsForThing) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10654,13 +9939,8 @@ func (m *awsRestjson1_serializeOpListJobs) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10736,13 +10016,8 @@ func (m *awsRestjson1_serializeOpListMitigationActions) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/mitigationactions/actions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10802,13 +10077,8 @@ func (m *awsRestjson1_serializeOpListOTAUpdates) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/otaUpdates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10868,13 +10138,8 @@ func (m *awsRestjson1_serializeOpListOutgoingCertificates) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/certificates-out-going") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -10934,13 +10199,8 @@ func (m *awsRestjson1_serializeOpListPolicies) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/policies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11000,13 +10260,8 @@ func (m *awsRestjson1_serializeOpListPolicyPrincipals) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/policy-principals") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11071,13 +10326,8 @@ func (m *awsRestjson1_serializeOpListPolicyVersions) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/policies/{policyName}/version") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11134,13 +10384,8 @@ func (m *awsRestjson1_serializeOpListPrincipalPolicies) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/principal-policies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11205,13 +10450,8 @@ func (m *awsRestjson1_serializeOpListPrincipalThings) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/principals/things") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11272,13 +10512,8 @@ func (m *awsRestjson1_serializeOpListProvisioningTemplates) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/provisioning-templates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11334,13 +10569,8 @@ func (m *awsRestjson1_serializeOpListProvisioningTemplateVersions) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/provisioning-templates/{templateName}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11405,13 +10635,8 @@ func (m *awsRestjson1_serializeOpListRoleAliases) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/role-aliases") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11471,13 +10696,8 @@ func (m *awsRestjson1_serializeOpListScheduledAudits) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/audit/scheduledaudits") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11533,13 +10753,8 @@ func (m *awsRestjson1_serializeOpListSecurityProfiles) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/security-profiles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11603,13 +10818,8 @@ func (m *awsRestjson1_serializeOpListSecurityProfilesForTarget) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/security-profiles-for-target") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11673,13 +10883,8 @@ func (m *awsRestjson1_serializeOpListStreams) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/streams") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11739,13 +10944,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11801,13 +11001,8 @@ func (m *awsRestjson1_serializeOpListTargetsForPolicy) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/policy-targets/{policyName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11872,13 +11067,8 @@ func (m *awsRestjson1_serializeOpListTargetsForSecurityProfile) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/security-profiles/{securityProfileName}/targets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -11943,13 +11133,8 @@ func (m *awsRestjson1_serializeOpListThingGroups) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/thing-groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12017,13 +11202,8 @@ func (m *awsRestjson1_serializeOpListThingGroupsForThing) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}/thing-groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12088,13 +11268,8 @@ func (m *awsRestjson1_serializeOpListThingPrincipals) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}/principals") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12159,13 +11334,8 @@ func (m *awsRestjson1_serializeOpListThingRegistrationTaskReports) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/thing-registration-tasks/{taskId}/reports") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12234,13 +11404,8 @@ func (m *awsRestjson1_serializeOpListThingRegistrationTasks) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/thing-registration-tasks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12300,13 +11465,8 @@ func (m *awsRestjson1_serializeOpListThings) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/things") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12374,13 +11534,8 @@ func (m *awsRestjson1_serializeOpListThingsInBillingGroup) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/billing-groups/{billingGroupName}/things") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12445,13 +11600,8 @@ func (m *awsRestjson1_serializeOpListThingsInThingGroup) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/thing-groups/{thingGroupName}/things") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12520,13 +11670,8 @@ func (m *awsRestjson1_serializeOpListThingTypes) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/thing-types") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12586,13 +11731,8 @@ func (m *awsRestjson1_serializeOpListTopicRuleDestinations) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/destinations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12648,13 +11788,8 @@ func (m *awsRestjson1_serializeOpListTopicRules) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/rules") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12718,13 +11853,8 @@ func (m *awsRestjson1_serializeOpListV2LoggingLevels) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2LoggingLevel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12784,13 +11914,8 @@ func (m *awsRestjson1_serializeOpListViolationEvents) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/violation-events") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12870,13 +11995,8 @@ func (m *awsRestjson1_serializeOpRegisterCACertificate) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/cacertificate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -12974,13 +12094,8 @@ func (m *awsRestjson1_serializeOpRegisterCertificate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/certificate/register") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13065,13 +12180,8 @@ func (m *awsRestjson1_serializeOpRegisterCertificateWithoutCA) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/certificate/register-no-ca") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13143,13 +12253,8 @@ func (m *awsRestjson1_serializeOpRegisterThing) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/things") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13223,13 +12328,8 @@ func (m *awsRestjson1_serializeOpRejectCertificateTransfer) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/reject-certificate-transfer/{certificateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13309,13 +12409,8 @@ func (m *awsRestjson1_serializeOpRemoveThingFromBillingGroup) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/billing-groups/removeThingFromBillingGroup") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13397,13 +12492,8 @@ func (m *awsRestjson1_serializeOpRemoveThingFromThingGroup) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/thing-groups/removeThingFromThingGroup") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13485,13 +12575,8 @@ func (m *awsRestjson1_serializeOpReplaceTopicRule) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/rules/{ruleName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13563,13 +12648,8 @@ func (m *awsRestjson1_serializeOpSearchIndex) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/indices/search") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13656,13 +12736,8 @@ func (m *awsRestjson1_serializeOpSetDefaultAuthorizer) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/default-authorizer") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13729,13 +12804,8 @@ func (m *awsRestjson1_serializeOpSetDefaultPolicyVersion) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/policies/{policyName}/version/{policyVersionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13801,13 +12871,8 @@ func (m *awsRestjson1_serializeOpSetLoggingOptions) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/loggingOptions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13866,13 +12931,8 @@ func (m *awsRestjson1_serializeOpSetV2LoggingLevel) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v2LoggingLevel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -13946,13 +13006,8 @@ func (m *awsRestjson1_serializeOpSetV2LoggingOptions) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2LoggingOptions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -14029,13 +13084,8 @@ func (m *awsRestjson1_serializeOpStartAuditMitigationActionsTask) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/audit/mitigationactions/tasks/{taskId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -14129,13 +13179,8 @@ func (m *awsRestjson1_serializeOpStartDetectMitigationActionsTask) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/detect/mitigationactions/tasks/{taskId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -14246,13 +13291,8 @@ func (m *awsRestjson1_serializeOpStartOnDemandAuditTask) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/audit/tasks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -14321,13 +13361,8 @@ func (m *awsRestjson1_serializeOpStartThingRegistrationTask) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/thing-registration-tasks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -14409,13 +13444,8 @@ func (m *awsRestjson1_serializeOpStopThingRegistrationTask) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/thing-registration-tasks/{taskId}/cancel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -14472,13 +13502,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -14552,13 +13577,8 @@ func (m *awsRestjson1_serializeOpTestAuthorization) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/test-authorization") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -14659,13 +13679,8 @@ func (m *awsRestjson1_serializeOpTestInvokeAuthorizer) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/authorizer/{authorizerName}/test") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -14771,13 +13786,8 @@ func (m *awsRestjson1_serializeOpTransferCertificate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/transfer-certificate/{certificateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -14861,13 +13871,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/untag") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -14941,13 +13946,8 @@ func (m *awsRestjson1_serializeOpUpdateAccountAuditConfiguration) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/audit/configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -15028,13 +14028,8 @@ func (m *awsRestjson1_serializeOpUpdateAuditSuppression) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/audit/suppressions/update") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -15123,13 +14118,8 @@ func (m *awsRestjson1_serializeOpUpdateAuthorizer) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/authorizer/{authorizerName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -15226,13 +14216,8 @@ func (m *awsRestjson1_serializeOpUpdateBillingGroup) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/billing-groups/{billingGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -15319,13 +14304,8 @@ func (m *awsRestjson1_serializeOpUpdateCACertificate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/cacertificate/{certificateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -15420,13 +14400,8 @@ func (m *awsRestjson1_serializeOpUpdateCertificate) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/certificates/{certificateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -15487,13 +14462,8 @@ func (m *awsRestjson1_serializeOpUpdateCustomMetric) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/custom-metric/{metricName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -15573,13 +14543,8 @@ func (m *awsRestjson1_serializeOpUpdateDimension) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/dimensions/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -15661,13 +14626,8 @@ func (m *awsRestjson1_serializeOpUpdateDomainConfiguration) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/domainConfigurations/{domainConfigurationName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -15759,13 +14719,8 @@ func (m *awsRestjson1_serializeOpUpdateDynamicThingGroup) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/dynamic-thing-groups/{thingGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -15867,13 +14822,8 @@ func (m *awsRestjson1_serializeOpUpdateEventConfigurations) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/event-configurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -15942,13 +14892,8 @@ func (m *awsRestjson1_serializeOpUpdateIndexingConfiguration) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/indexing/config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -16024,13 +14969,8 @@ func (m *awsRestjson1_serializeOpUpdateJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/jobs/{jobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -16142,13 +15082,8 @@ func (m *awsRestjson1_serializeOpUpdateMitigationAction) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/mitigationactions/actions/{actionName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -16235,13 +15170,8 @@ func (m *awsRestjson1_serializeOpUpdateProvisioningTemplate) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/provisioning-templates/{templateName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -16348,13 +15278,8 @@ func (m *awsRestjson1_serializeOpUpdateRoleAlias) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/role-aliases/{roleAlias}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -16439,13 +15364,8 @@ func (m *awsRestjson1_serializeOpUpdateScheduledAudit) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/audit/scheduledaudits/{scheduledAuditName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -16542,13 +15462,8 @@ func (m *awsRestjson1_serializeOpUpdateSecurityProfile) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/security-profiles/{securityProfileName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -16675,13 +15590,8 @@ func (m *awsRestjson1_serializeOpUpdateStream) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/streams/{streamId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -16773,13 +15683,8 @@ func (m *awsRestjson1_serializeOpUpdateThing) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -16876,13 +15781,8 @@ func (m *awsRestjson1_serializeOpUpdateThingGroup) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/thing-groups/{thingGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -16969,13 +15869,8 @@ func (m *awsRestjson1_serializeOpUpdateThingGroupsForThing) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/thing-groups/updateThingGroupsForThing") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -17061,13 +15956,8 @@ func (m *awsRestjson1_serializeOpUpdateTopicRuleDestination) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/destinations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -17139,13 +16029,8 @@ func (m *awsRestjson1_serializeOpValidateSecurityProfileBehaviors) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/security-profile-behaviors/validate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/iot1clickdevicesservice/go.mod b/service/iot1clickdevicesservice/go.mod index bb9c7f1f4d8..87e52e58edd 100644 --- a/service/iot1clickdevicesservice/go.mod +++ b/service/iot1clickdevicesservice/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iot1clickdevicesservice/go.sum b/service/iot1clickdevicesservice/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/iot1clickdevicesservice/go.sum +++ b/service/iot1clickdevicesservice/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iot1clickdevicesservice/serializers.go b/service/iot1clickdevicesservice/serializers.go index d6449aa522a..896183608e1 100644 --- a/service/iot1clickdevicesservice/serializers.go +++ b/service/iot1clickdevicesservice/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpClaimDevicesByClaimCode) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/claims/{ClaimCode}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -100,13 +95,8 @@ func (m *awsRestjson1_serializeOpDescribeDevice) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/devices/{DeviceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -163,13 +153,8 @@ func (m *awsRestjson1_serializeOpFinalizeDeviceClaim) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/devices/{DeviceId}/finalize-claim") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -251,13 +236,8 @@ func (m *awsRestjson1_serializeOpGetDeviceMethods) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/devices/{DeviceId}/methods") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -314,13 +294,8 @@ func (m *awsRestjson1_serializeOpInitiateDeviceClaim) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/devices/{DeviceId}/initiate-claim") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -377,13 +352,8 @@ func (m *awsRestjson1_serializeOpInvokeDeviceMethod) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/devices/{DeviceId}/methods") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -470,13 +440,8 @@ func (m *awsRestjson1_serializeOpListDeviceEvents) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/devices/{DeviceId}/events") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -549,13 +514,8 @@ func (m *awsRestjson1_serializeOpListDevices) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/devices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -615,13 +575,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -678,13 +633,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -766,13 +716,8 @@ func (m *awsRestjson1_serializeOpUnclaimDevice) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/devices/{DeviceId}/unclaim") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -829,13 +774,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -898,13 +838,8 @@ func (m *awsRestjson1_serializeOpUpdateDeviceState) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/devices/{DeviceId}/state") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/iot1clickprojects/go.mod b/service/iot1clickprojects/go.mod index b63cb9f9fbd..7efc388ec18 100644 --- a/service/iot1clickprojects/go.mod +++ b/service/iot1clickprojects/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iot1clickprojects/go.sum b/service/iot1clickprojects/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/iot1clickprojects/go.sum +++ b/service/iot1clickprojects/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iot1clickprojects/serializers.go b/service/iot1clickprojects/serializers.go index b0d27c92069..d22f3e19ff4 100644 --- a/service/iot1clickprojects/serializers.go +++ b/service/iot1clickprojects/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAssociateDeviceWithPlacement) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/projects/{projectName}/placements/{placementName}/devices/{deviceTemplateName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -140,13 +135,8 @@ func (m *awsRestjson1_serializeOpCreatePlacement) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/projects/{projectName}/placements") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -233,13 +223,8 @@ func (m *awsRestjson1_serializeOpCreateProject) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/projects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -325,13 +310,8 @@ func (m *awsRestjson1_serializeOpDeletePlacement) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/projects/{projectName}/placements/{placementName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -397,13 +377,8 @@ func (m *awsRestjson1_serializeOpDeleteProject) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/projects/{projectName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -460,13 +435,8 @@ func (m *awsRestjson1_serializeOpDescribePlacement) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/projects/{projectName}/placements/{placementName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -532,13 +502,8 @@ func (m *awsRestjson1_serializeOpDescribeProject) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/projects/{projectName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -595,13 +560,8 @@ func (m *awsRestjson1_serializeOpDisassociateDeviceFromPlacement) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/projects/{projectName}/placements/{placementName}/devices/{deviceTemplateName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -676,13 +636,8 @@ func (m *awsRestjson1_serializeOpGetDevicesInPlacement) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/projects/{projectName}/placements/{placementName}/devices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -748,13 +703,8 @@ func (m *awsRestjson1_serializeOpListPlacements) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/projects/{projectName}/placements") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -819,13 +769,8 @@ func (m *awsRestjson1_serializeOpListProjects) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/projects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -881,13 +826,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -944,13 +884,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1032,13 +967,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1101,13 +1031,8 @@ func (m *awsRestjson1_serializeOpUpdatePlacement) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/projects/{projectName}/placements/{placementName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1198,13 +1123,8 @@ func (m *awsRestjson1_serializeOpUpdateProject) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/projects/{projectName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/iotanalytics/go.mod b/service/iotanalytics/go.mod index 71a48efcf3e..4e5a96f1e7c 100644 --- a/service/iotanalytics/go.mod +++ b/service/iotanalytics/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotanalytics/go.sum b/service/iotanalytics/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/iotanalytics/go.sum +++ b/service/iotanalytics/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iotanalytics/serializers.go b/service/iotanalytics/serializers.go index 514a3455b87..b74bb45a67b 100644 --- a/service/iotanalytics/serializers.go +++ b/service/iotanalytics/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpBatchPutMessage) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/messages/batch") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -117,13 +112,8 @@ func (m *awsRestjson1_serializeOpCancelPipelineReprocessing) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/pipelines/{pipelineName}/reprocessing/{reprocessingId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -189,13 +179,8 @@ func (m *awsRestjson1_serializeOpCreateChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/channels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -283,13 +268,8 @@ func (m *awsRestjson1_serializeOpCreateDataset) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/datasets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -405,13 +385,8 @@ func (m *awsRestjson1_serializeOpCreateDatasetContent) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/datasets/{datasetName}/content") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -491,13 +466,8 @@ func (m *awsRestjson1_serializeOpCreateDatastore) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/datastores") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -592,13 +562,8 @@ func (m *awsRestjson1_serializeOpCreatePipeline) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/pipelines") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -679,13 +644,8 @@ func (m *awsRestjson1_serializeOpDeleteChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/channels/{channelName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -742,13 +702,8 @@ func (m *awsRestjson1_serializeOpDeleteDataset) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/datasets/{datasetName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -805,13 +760,8 @@ func (m *awsRestjson1_serializeOpDeleteDatasetContent) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/datasets/{datasetName}/content") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -872,13 +822,8 @@ func (m *awsRestjson1_serializeOpDeleteDatastore) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/datastores/{datastoreName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -935,13 +880,8 @@ func (m *awsRestjson1_serializeOpDeletePipeline) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/pipelines/{pipelineName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -998,13 +938,8 @@ func (m *awsRestjson1_serializeOpDescribeChannel) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/channels/{channelName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1065,13 +1000,8 @@ func (m *awsRestjson1_serializeOpDescribeDataset) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/datasets/{datasetName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1128,13 +1058,8 @@ func (m *awsRestjson1_serializeOpDescribeDatastore) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/datastores/{datastoreName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1195,13 +1120,8 @@ func (m *awsRestjson1_serializeOpDescribeLoggingOptions) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/logging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1245,13 +1165,8 @@ func (m *awsRestjson1_serializeOpDescribePipeline) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/pipelines/{pipelineName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1308,13 +1223,8 @@ func (m *awsRestjson1_serializeOpGetDatasetContent) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/datasets/{datasetName}/content") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1375,13 +1285,8 @@ func (m *awsRestjson1_serializeOpListChannels) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/channels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1437,13 +1342,8 @@ func (m *awsRestjson1_serializeOpListDatasetContents) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/datasets/{datasetName}/contents") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1516,13 +1416,8 @@ func (m *awsRestjson1_serializeOpListDatasets) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/datasets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1578,13 +1473,8 @@ func (m *awsRestjson1_serializeOpListDatastores) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/datastores") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1640,13 +1530,8 @@ func (m *awsRestjson1_serializeOpListPipelines) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/pipelines") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1702,13 +1587,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1760,13 +1640,8 @@ func (m *awsRestjson1_serializeOpPutLoggingOptions) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/logging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1835,13 +1710,8 @@ func (m *awsRestjson1_serializeOpRunPipelineActivity) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/pipelineactivities/run") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1917,13 +1787,8 @@ func (m *awsRestjson1_serializeOpSampleChannelData) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/channels/{channelName}/sample") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1992,13 +1857,8 @@ func (m *awsRestjson1_serializeOpStartPipelineReprocessing) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/pipelines/{pipelineName}/reprocessing") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2090,13 +1950,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2173,13 +2028,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2237,13 +2087,8 @@ func (m *awsRestjson1_serializeOpUpdateChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/channels/{channelName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2332,13 +2177,8 @@ func (m *awsRestjson1_serializeOpUpdateDataset) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/datasets/{datasetName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2455,13 +2295,8 @@ func (m *awsRestjson1_serializeOpUpdateDatastore) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/datastores/{datastoreName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2557,13 +2392,8 @@ func (m *awsRestjson1_serializeOpUpdatePipeline) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/pipelines/{pipelineName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/iotdataplane/go.mod b/service/iotdataplane/go.mod index 2b6038c89d3..04832e133e1 100644 --- a/service/iotdataplane/go.mod +++ b/service/iotdataplane/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotdataplane/go.sum b/service/iotdataplane/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/iotdataplane/go.sum +++ b/service/iotdataplane/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iotdataplane/serializers.go b/service/iotdataplane/serializers.go index 82ff52fd8a7..3d564b773d6 100644 --- a/service/iotdataplane/serializers.go +++ b/service/iotdataplane/serializers.go @@ -34,13 +34,8 @@ func (m *awsRestjson1_serializeOpDeleteThingShadow) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}/shadow") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -101,13 +96,8 @@ func (m *awsRestjson1_serializeOpGetThingShadow) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}/shadow") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -168,13 +158,8 @@ func (m *awsRestjson1_serializeOpListNamedShadowsForThing) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/api/things/shadow/ListNamedShadowsForThing/{thingName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -239,13 +224,8 @@ func (m *awsRestjson1_serializeOpPublish) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/topics/{topic}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -317,13 +297,8 @@ func (m *awsRestjson1_serializeOpUpdateThingShadow) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}/shadow") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/iotdeviceadvisor/go.mod b/service/iotdeviceadvisor/go.mod index 51327dce898..9e8f7940595 100644 --- a/service/iotdeviceadvisor/go.mod +++ b/service/iotdeviceadvisor/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotdeviceadvisor/go.sum b/service/iotdeviceadvisor/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/iotdeviceadvisor/go.sum +++ b/service/iotdeviceadvisor/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iotdeviceadvisor/serializers.go b/service/iotdeviceadvisor/serializers.go index 6ef6df0099b..ea4bfed3893 100644 --- a/service/iotdeviceadvisor/serializers.go +++ b/service/iotdeviceadvisor/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateSuiteDefinition) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/suiteDefinitions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -118,13 +113,8 @@ func (m *awsRestjson1_serializeOpDeleteSuiteDefinition) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/suiteDefinitions/{suiteDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -181,13 +171,8 @@ func (m *awsRestjson1_serializeOpGetSuiteDefinition) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/suiteDefinitions/{suiteDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -248,13 +233,8 @@ func (m *awsRestjson1_serializeOpGetSuiteRun) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/suiteDefinitions/{suiteDefinitionId}/suiteRuns/{suiteRunId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -320,13 +300,8 @@ func (m *awsRestjson1_serializeOpGetSuiteRunReport) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/suiteDefinitions/{suiteDefinitionId}/suiteRuns/{suiteRunId}/report") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -392,13 +367,8 @@ func (m *awsRestjson1_serializeOpListSuiteDefinitions) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/suiteDefinitions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -454,13 +424,8 @@ func (m *awsRestjson1_serializeOpListSuiteRuns) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/suiteRuns") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -524,13 +489,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -587,13 +547,8 @@ func (m *awsRestjson1_serializeOpListTestCases) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/testCases") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -653,13 +608,8 @@ func (m *awsRestjson1_serializeOpStartSuiteRun) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/suiteDefinitions/{suiteDefinitionId}/suiteRuns") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -753,13 +703,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -841,13 +786,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -910,13 +850,8 @@ func (m *awsRestjson1_serializeOpUpdateSuiteDefinition) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/suiteDefinitions/{suiteDefinitionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/iotevents/go.mod b/service/iotevents/go.mod index 776ab7b65ac..ff2fc6252a4 100644 --- a/service/iotevents/go.mod +++ b/service/iotevents/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotevents/go.sum b/service/iotevents/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/iotevents/go.sum +++ b/service/iotevents/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iotevents/serializers.go b/service/iotevents/serializers.go index 98f8ba5b9a6..3ff34a12394 100644 --- a/service/iotevents/serializers.go +++ b/service/iotevents/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateDetectorModel) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/detector-models") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -143,13 +138,8 @@ func (m *awsRestjson1_serializeOpCreateInput) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/inputs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -235,13 +225,8 @@ func (m *awsRestjson1_serializeOpDeleteDetectorModel) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/detector-models/{detectorModelName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -298,13 +283,8 @@ func (m *awsRestjson1_serializeOpDeleteInput) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/inputs/{inputName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -361,13 +341,8 @@ func (m *awsRestjson1_serializeOpDescribeDetectorModel) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/detector-models/{detectorModelName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -428,13 +403,8 @@ func (m *awsRestjson1_serializeOpDescribeDetectorModelAnalysis) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/analysis/detector-models/{analysisId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -491,13 +461,8 @@ func (m *awsRestjson1_serializeOpDescribeInput) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/inputs/{inputName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -554,13 +519,8 @@ func (m *awsRestjson1_serializeOpDescribeLoggingOptions) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/logging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -604,13 +564,8 @@ func (m *awsRestjson1_serializeOpGetDetectorModelAnalysisResults) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/analysis/detector-models/{analysisId}/results") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -675,13 +630,8 @@ func (m *awsRestjson1_serializeOpListDetectorModels) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/detector-models") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -737,13 +687,8 @@ func (m *awsRestjson1_serializeOpListDetectorModelVersions) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/detector-models/{detectorModelName}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -808,13 +753,8 @@ func (m *awsRestjson1_serializeOpListInputs) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/inputs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -870,13 +810,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -928,13 +863,8 @@ func (m *awsRestjson1_serializeOpPutLoggingOptions) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/logging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1003,13 +933,8 @@ func (m *awsRestjson1_serializeOpStartDetectorModelAnalysis) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/analysis/detector-models") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1078,13 +1003,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1161,13 +1081,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1225,13 +1140,8 @@ func (m *awsRestjson1_serializeOpUpdateDetectorModel) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/detector-models/{detectorModelName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1328,13 +1238,8 @@ func (m *awsRestjson1_serializeOpUpdateInput) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/inputs/{inputName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/ioteventsdata/go.mod b/service/ioteventsdata/go.mod index cda9e727db9..5bcfe3ecff9 100644 --- a/service/ioteventsdata/go.mod +++ b/service/ioteventsdata/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ioteventsdata/go.sum b/service/ioteventsdata/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/ioteventsdata/go.sum +++ b/service/ioteventsdata/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ioteventsdata/serializers.go b/service/ioteventsdata/serializers.go index 13e242dbf49..2d755b77271 100644 --- a/service/ioteventsdata/serializers.go +++ b/service/ioteventsdata/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpBatchPutMessage) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/inputs/messages") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -111,13 +106,8 @@ func (m *awsRestjson1_serializeOpBatchUpdateDetector) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/detectors") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -186,13 +176,8 @@ func (m *awsRestjson1_serializeOpDescribeDetector) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/detectors/{detectorModelName}/keyValues") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -253,13 +238,8 @@ func (m *awsRestjson1_serializeOpListDetectors) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/detectors/{detectorModelName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/iotfleethub/go.mod b/service/iotfleethub/go.mod index ebcf4f53750..0103634178e 100644 --- a/service/iotfleethub/go.mod +++ b/service/iotfleethub/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotfleethub/go.sum b/service/iotfleethub/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/iotfleethub/go.sum +++ b/service/iotfleethub/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iotfleethub/serializers.go b/service/iotfleethub/serializers.go index 5caa40939ec..f2a999793c8 100644 --- a/service/iotfleethub/serializers.go +++ b/service/iotfleethub/serializers.go @@ -35,13 +35,8 @@ func (m *awsRestjson1_serializeOpCreateApplication) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -130,13 +125,8 @@ func (m *awsRestjson1_serializeOpDeleteApplication) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications/{applicationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -197,13 +187,8 @@ func (m *awsRestjson1_serializeOpDescribeApplication) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/applications/{applicationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -260,13 +245,8 @@ func (m *awsRestjson1_serializeOpListApplications) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/applications") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -318,13 +298,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -381,13 +356,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -469,13 +439,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -538,13 +503,8 @@ func (m *awsRestjson1_serializeOpUpdateApplication) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications/{applicationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/iotjobsdataplane/go.mod b/service/iotjobsdataplane/go.mod index 6fd23f5ab78..9f1bd47b24d 100644 --- a/service/iotjobsdataplane/go.mod +++ b/service/iotjobsdataplane/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotjobsdataplane/go.sum b/service/iotjobsdataplane/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/iotjobsdataplane/go.sum +++ b/service/iotjobsdataplane/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iotjobsdataplane/serializers.go b/service/iotjobsdataplane/serializers.go index 3dcc78008d7..54ae597bc16 100644 --- a/service/iotjobsdataplane/serializers.go +++ b/service/iotjobsdataplane/serializers.go @@ -35,13 +35,8 @@ func (m *awsRestjson1_serializeOpDescribeJobExecution) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}/jobs/{jobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -115,13 +110,8 @@ func (m *awsRestjson1_serializeOpGetPendingJobExecutions) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -178,13 +168,8 @@ func (m *awsRestjson1_serializeOpStartNextPendingJobExecution) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}/jobs/$next") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -271,13 +256,8 @@ func (m *awsRestjson1_serializeOpUpdateJobExecution) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/things/{thingName}/jobs/{jobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/iotsitewise/go.mod b/service/iotsitewise/go.mod index 746e565e73a..cf209f77a2e 100644 --- a/service/iotsitewise/go.mod +++ b/service/iotsitewise/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/iotsitewise/go.sum b/service/iotsitewise/go.sum index d937214c3eb..9ddcad9aa66 100644 --- a/service/iotsitewise/go.sum +++ b/service/iotsitewise/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= 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.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= diff --git a/service/iotsitewise/serializers.go b/service/iotsitewise/serializers.go index e28f0947043..a1386aff5f8 100644 --- a/service/iotsitewise/serializers.go +++ b/service/iotsitewise/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpAssociateAssets) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/assets/{assetId}/associate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -133,13 +128,8 @@ func (m *awsRestjson1_serializeOpBatchAssociateProjectAssets) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/projects/{projectId}/assets/associate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -226,13 +216,8 @@ func (m *awsRestjson1_serializeOpBatchDisassociateProjectAssets) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/projects/{projectId}/assets/disassociate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -319,13 +304,8 @@ func (m *awsRestjson1_serializeOpBatchPutAssetPropertyValue) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/properties") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -394,13 +374,8 @@ func (m *awsRestjson1_serializeOpCreateAccessPolicy) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/access-policies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -493,13 +468,8 @@ func (m *awsRestjson1_serializeOpCreateAsset) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/assets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -583,13 +553,8 @@ func (m *awsRestjson1_serializeOpCreateAssetModel) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/asset-models") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -694,13 +659,8 @@ func (m *awsRestjson1_serializeOpCreateDashboard) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/dashboards") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -794,13 +754,8 @@ func (m *awsRestjson1_serializeOpCreateGateway) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/20200301/gateways") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -881,13 +836,8 @@ func (m *awsRestjson1_serializeOpCreatePortal) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/portals") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -993,13 +943,8 @@ func (m *awsRestjson1_serializeOpCreateProject) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/projects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1088,13 +1033,8 @@ func (m *awsRestjson1_serializeOpDeleteAccessPolicy) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/access-policies/{accessPolicyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1155,13 +1095,8 @@ func (m *awsRestjson1_serializeOpDeleteAsset) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/assets/{assetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1222,13 +1157,8 @@ func (m *awsRestjson1_serializeOpDeleteAssetModel) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/asset-models/{assetModelId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1289,13 +1219,8 @@ func (m *awsRestjson1_serializeOpDeleteDashboard) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/dashboards/{dashboardId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1356,13 +1281,8 @@ func (m *awsRestjson1_serializeOpDeleteGateway) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/20200301/gateways/{gatewayId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1419,13 +1339,8 @@ func (m *awsRestjson1_serializeOpDeletePortal) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/portals/{portalId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1486,13 +1401,8 @@ func (m *awsRestjson1_serializeOpDeleteProject) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/projects/{projectId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1553,13 +1463,8 @@ func (m *awsRestjson1_serializeOpDescribeAccessPolicy) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/access-policies/{accessPolicyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1616,13 +1521,8 @@ func (m *awsRestjson1_serializeOpDescribeAsset) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/assets/{assetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1679,13 +1579,8 @@ func (m *awsRestjson1_serializeOpDescribeAssetModel) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/asset-models/{assetModelId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1742,13 +1637,8 @@ func (m *awsRestjson1_serializeOpDescribeAssetProperty) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/assets/{assetId}/properties/{propertyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1814,13 +1704,8 @@ func (m *awsRestjson1_serializeOpDescribeDashboard) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/dashboards/{dashboardId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1877,13 +1762,8 @@ func (m *awsRestjson1_serializeOpDescribeDefaultEncryptionConfiguration) HandleS } opPath, opQuery := httpbinding.SplitURI("/configuration/account/encryption") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1927,13 +1807,8 @@ func (m *awsRestjson1_serializeOpDescribeGateway) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/20200301/gateways/{gatewayId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1990,13 +1865,8 @@ func (m *awsRestjson1_serializeOpDescribeGatewayCapabilityConfiguration) HandleS } opPath, opQuery := httpbinding.SplitURI("/20200301/gateways/{gatewayId}/capability/{capabilityNamespace}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2062,13 +1932,8 @@ func (m *awsRestjson1_serializeOpDescribeLoggingOptions) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/logging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2112,13 +1977,8 @@ func (m *awsRestjson1_serializeOpDescribePortal) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/portals/{portalId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2175,13 +2035,8 @@ func (m *awsRestjson1_serializeOpDescribeProject) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/projects/{projectId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2238,13 +2093,8 @@ func (m *awsRestjson1_serializeOpDisassociateAssets) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/assets/{assetId}/disassociate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2334,13 +2184,8 @@ func (m *awsRestjson1_serializeOpGetAssetPropertyAggregates) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/properties/aggregates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2436,13 +2281,8 @@ func (m *awsRestjson1_serializeOpGetAssetPropertyValue) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/properties/latest") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2502,13 +2342,8 @@ func (m *awsRestjson1_serializeOpGetAssetPropertyValueHistory) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/properties/history") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2594,13 +2429,8 @@ func (m *awsRestjson1_serializeOpListAccessPolicies) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/access-policies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2676,13 +2506,8 @@ func (m *awsRestjson1_serializeOpListAssetModels) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/asset-models") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2738,13 +2563,8 @@ func (m *awsRestjson1_serializeOpListAssetRelationships) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/assets/{assetId}/assetRelationships") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2813,13 +2633,8 @@ func (m *awsRestjson1_serializeOpListAssets) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/assets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2883,13 +2698,8 @@ func (m *awsRestjson1_serializeOpListAssociatedAssets) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/assets/{assetId}/hierarchies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2962,13 +2772,8 @@ func (m *awsRestjson1_serializeOpListDashboards) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/dashboards") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3028,13 +2833,8 @@ func (m *awsRestjson1_serializeOpListGateways) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/20200301/gateways") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3090,13 +2890,8 @@ func (m *awsRestjson1_serializeOpListPortals) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/portals") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3152,13 +2947,8 @@ func (m *awsRestjson1_serializeOpListProjectAssets) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/projects/{projectId}/assets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3223,13 +3013,8 @@ func (m *awsRestjson1_serializeOpListProjects) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/projects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3289,13 +3074,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3347,13 +3127,8 @@ func (m *awsRestjson1_serializeOpPutDefaultEncryptionConfiguration) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/configuration/account/encryption") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3425,13 +3200,8 @@ func (m *awsRestjson1_serializeOpPutLoggingOptions) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/logging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3500,13 +3270,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3583,13 +3348,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3647,13 +3407,8 @@ func (m *awsRestjson1_serializeOpUpdateAccessPolicy) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/access-policies/{accessPolicyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3752,13 +3507,8 @@ func (m *awsRestjson1_serializeOpUpdateAsset) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/assets/{assetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3843,13 +3593,8 @@ func (m *awsRestjson1_serializeOpUpdateAssetModel) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/asset-models/{assetModelId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3960,13 +3705,8 @@ func (m *awsRestjson1_serializeOpUpdateAssetProperty) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/assets/{assetId}/properties/{propertyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4065,13 +3805,8 @@ func (m *awsRestjson1_serializeOpUpdateDashboard) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/dashboards/{dashboardId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4166,13 +3901,8 @@ func (m *awsRestjson1_serializeOpUpdateGateway) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/20200301/gateways/{gatewayId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4252,13 +3982,8 @@ func (m *awsRestjson1_serializeOpUpdateGatewayCapabilityConfiguration) HandleSer } opPath, opQuery := httpbinding.SplitURI("/20200301/gateways/{gatewayId}/capability") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4343,13 +4068,8 @@ func (m *awsRestjson1_serializeOpUpdatePortal) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/portals/{portalId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4456,13 +4176,8 @@ func (m *awsRestjson1_serializeOpUpdateProject) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/projects/{projectId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/iotwireless/go.mod b/service/iotwireless/go.mod index e444ccdb222..9c664e62e50 100644 --- a/service/iotwireless/go.mod +++ b/service/iotwireless/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/iotwireless/go.sum b/service/iotwireless/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/iotwireless/go.sum +++ b/service/iotwireless/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/iotwireless/serializers.go b/service/iotwireless/serializers.go index 061acfb3c80..809188fe102 100644 --- a/service/iotwireless/serializers.go +++ b/service/iotwireless/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAssociateAwsAccountWithPartnerAccount) HandleSe } opPath, opQuery := httpbinding.SplitURI("/partner-accounts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -123,13 +118,8 @@ func (m *awsRestjson1_serializeOpAssociateWirelessDeviceWithThing) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/wireless-devices/{Id}/thing") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -209,13 +199,8 @@ func (m *awsRestjson1_serializeOpAssociateWirelessGatewayWithCertificate) Handle } opPath, opQuery := httpbinding.SplitURI("/wireless-gateways/{Id}/certificate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -295,13 +280,8 @@ func (m *awsRestjson1_serializeOpAssociateWirelessGatewayWithThing) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/wireless-gateways/{Id}/thing") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -381,13 +361,8 @@ func (m *awsRestjson1_serializeOpCreateDestination) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/destinations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -486,13 +461,8 @@ func (m *awsRestjson1_serializeOpCreateDeviceProfile) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/device-profiles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -578,13 +548,8 @@ func (m *awsRestjson1_serializeOpCreateServiceProfile) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/service-profiles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -670,13 +635,8 @@ func (m *awsRestjson1_serializeOpCreateWirelessDevice) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/wireless-devices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -770,13 +730,8 @@ func (m *awsRestjson1_serializeOpCreateWirelessGateway) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/wireless-gateways") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -867,13 +822,8 @@ func (m *awsRestjson1_serializeOpCreateWirelessGatewayTask) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/wireless-gateways/{Id}/tasks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -953,13 +903,8 @@ func (m *awsRestjson1_serializeOpCreateWirelessGatewayTaskDefinition) HandleSeri } opPath, opQuery := httpbinding.SplitURI("/wireless-gateway-task-definitions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1050,13 +995,8 @@ func (m *awsRestjson1_serializeOpDeleteDestination) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/destinations/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1113,13 +1053,8 @@ func (m *awsRestjson1_serializeOpDeleteDeviceProfile) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/device-profiles/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1176,13 +1111,8 @@ func (m *awsRestjson1_serializeOpDeleteServiceProfile) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/service-profiles/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1239,13 +1169,8 @@ func (m *awsRestjson1_serializeOpDeleteWirelessDevice) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/wireless-devices/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1302,13 +1227,8 @@ func (m *awsRestjson1_serializeOpDeleteWirelessGateway) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/wireless-gateways/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1365,13 +1285,8 @@ func (m *awsRestjson1_serializeOpDeleteWirelessGatewayTask) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/wireless-gateways/{Id}/tasks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1428,13 +1343,8 @@ func (m *awsRestjson1_serializeOpDeleteWirelessGatewayTaskDefinition) HandleSeri } opPath, opQuery := httpbinding.SplitURI("/wireless-gateway-task-definitions/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1491,13 +1401,8 @@ func (m *awsRestjson1_serializeOpDisassociateAwsAccountFromPartnerAccount) Handl } opPath, opQuery := httpbinding.SplitURI("/partner-accounts/{PartnerAccountId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1558,13 +1463,8 @@ func (m *awsRestjson1_serializeOpDisassociateWirelessDeviceFromThing) HandleSeri } opPath, opQuery := httpbinding.SplitURI("/wireless-devices/{Id}/thing") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1621,13 +1521,8 @@ func (m *awsRestjson1_serializeOpDisassociateWirelessGatewayFromCertificate) Han } opPath, opQuery := httpbinding.SplitURI("/wireless-gateways/{Id}/certificate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1684,13 +1579,8 @@ func (m *awsRestjson1_serializeOpDisassociateWirelessGatewayFromThing) HandleSer } opPath, opQuery := httpbinding.SplitURI("/wireless-gateways/{Id}/thing") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1747,13 +1637,8 @@ func (m *awsRestjson1_serializeOpGetDestination) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/destinations/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1810,13 +1695,8 @@ func (m *awsRestjson1_serializeOpGetDeviceProfile) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/device-profiles/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1873,13 +1753,8 @@ func (m *awsRestjson1_serializeOpGetPartnerAccount) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/partner-accounts/{PartnerAccountId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1940,13 +1815,8 @@ func (m *awsRestjson1_serializeOpGetServiceEndpoint) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/service-endpoint") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1998,13 +1868,8 @@ func (m *awsRestjson1_serializeOpGetServiceProfile) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/service-profiles/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2061,13 +1926,8 @@ func (m *awsRestjson1_serializeOpGetWirelessDevice) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/wireless-devices/{Identifier}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2128,13 +1988,8 @@ func (m *awsRestjson1_serializeOpGetWirelessDeviceStatistics) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/wireless-devices/{WirelessDeviceId}/statistics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2191,13 +2046,8 @@ func (m *awsRestjson1_serializeOpGetWirelessGateway) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/wireless-gateways/{Identifier}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2258,13 +2108,8 @@ func (m *awsRestjson1_serializeOpGetWirelessGatewayCertificate) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/wireless-gateways/{Id}/certificate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2321,13 +2166,8 @@ func (m *awsRestjson1_serializeOpGetWirelessGatewayFirmwareInformation) HandleSe } opPath, opQuery := httpbinding.SplitURI("/wireless-gateways/{Id}/firmware-information") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2384,13 +2224,8 @@ func (m *awsRestjson1_serializeOpGetWirelessGatewayStatistics) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/wireless-gateways/{WirelessGatewayId}/statistics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2447,13 +2282,8 @@ func (m *awsRestjson1_serializeOpGetWirelessGatewayTask) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/wireless-gateways/{Id}/tasks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2510,13 +2340,8 @@ func (m *awsRestjson1_serializeOpGetWirelessGatewayTaskDefinition) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/wireless-gateway-task-definitions/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2573,13 +2398,8 @@ func (m *awsRestjson1_serializeOpListDestinations) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/destinations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2635,13 +2455,8 @@ func (m *awsRestjson1_serializeOpListDeviceProfiles) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/device-profiles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2697,13 +2512,8 @@ func (m *awsRestjson1_serializeOpListPartnerAccounts) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/partner-accounts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2759,13 +2569,8 @@ func (m *awsRestjson1_serializeOpListServiceProfiles) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/service-profiles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2821,13 +2626,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2879,13 +2679,8 @@ func (m *awsRestjson1_serializeOpListWirelessDevices) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/wireless-devices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2957,13 +2752,8 @@ func (m *awsRestjson1_serializeOpListWirelessGateways) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/wireless-gateways") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3019,13 +2809,8 @@ func (m *awsRestjson1_serializeOpListWirelessGatewayTaskDefinitions) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/wireless-gateway-task-definitions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3085,13 +2870,8 @@ func (m *awsRestjson1_serializeOpSendDataToWirelessDevice) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/wireless-devices/{Id}/data") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3183,13 +2963,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3266,13 +3041,8 @@ func (m *awsRestjson1_serializeOpTestWirelessDevice) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/wireless-devices/{Id}/test") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3329,13 +3099,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3393,13 +3158,8 @@ func (m *awsRestjson1_serializeOpUpdateDestination) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/destinations/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3494,13 +3254,8 @@ func (m *awsRestjson1_serializeOpUpdatePartnerAccount) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/partner-accounts/{PartnerAccountId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3586,13 +3341,8 @@ func (m *awsRestjson1_serializeOpUpdateWirelessDevice) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/wireless-devices/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3689,13 +3439,8 @@ func (m *awsRestjson1_serializeOpUpdateWirelessGateway) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/wireless-gateways/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/ivs/go.mod b/service/ivs/go.mod index 1530cc07bca..22f47275bab 100644 --- a/service/ivs/go.mod +++ b/service/ivs/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ivs/go.sum b/service/ivs/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/ivs/go.sum +++ b/service/ivs/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ivs/serializers.go b/service/ivs/serializers.go index f25c458f1a4..435cc5daced 100644 --- a/service/ivs/serializers.go +++ b/service/ivs/serializers.go @@ -35,13 +35,8 @@ func (m *awsRestjson1_serializeOpBatchGetChannel) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/BatchGetChannel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -110,13 +105,8 @@ func (m *awsRestjson1_serializeOpBatchGetStreamKey) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/BatchGetStreamKey") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -185,13 +175,8 @@ func (m *awsRestjson1_serializeOpCreateChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/CreateChannel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -280,13 +265,8 @@ func (m *awsRestjson1_serializeOpCreateStreamKey) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/CreateStreamKey") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -360,13 +340,8 @@ func (m *awsRestjson1_serializeOpDeleteChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/DeleteChannel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -433,13 +408,8 @@ func (m *awsRestjson1_serializeOpDeletePlaybackKeyPair) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/DeletePlaybackKeyPair") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -506,13 +476,8 @@ func (m *awsRestjson1_serializeOpDeleteStreamKey) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/DeleteStreamKey") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -579,13 +544,8 @@ func (m *awsRestjson1_serializeOpGetChannel) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/GetChannel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -652,13 +612,8 @@ func (m *awsRestjson1_serializeOpGetPlaybackKeyPair) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/GetPlaybackKeyPair") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -725,13 +680,8 @@ func (m *awsRestjson1_serializeOpGetStream) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/GetStream") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -798,13 +748,8 @@ func (m *awsRestjson1_serializeOpGetStreamKey) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/GetStreamKey") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -871,13 +816,8 @@ func (m *awsRestjson1_serializeOpImportPlaybackKeyPair) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/ImportPlaybackKeyPair") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -956,13 +896,8 @@ func (m *awsRestjson1_serializeOpListChannels) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/ListChannels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1039,13 +974,8 @@ func (m *awsRestjson1_serializeOpListPlaybackKeyPairs) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/ListPlaybackKeyPairs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1117,13 +1047,8 @@ func (m *awsRestjson1_serializeOpListStreamKeys) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/ListStreamKeys") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1200,13 +1125,8 @@ func (m *awsRestjson1_serializeOpListStreams) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/ListStreams") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1278,13 +1198,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1369,13 +1284,8 @@ func (m *awsRestjson1_serializeOpPutMetadata) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/PutMetadata") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1447,13 +1357,8 @@ func (m *awsRestjson1_serializeOpStopStream) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/StopStream") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1520,13 +1425,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1608,13 +1508,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1677,13 +1572,8 @@ func (m *awsRestjson1_serializeOpUpdateChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/UpdateChannel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/kafka/go.mod b/service/kafka/go.mod index 2ec51afd700..5393c8c73e5 100644 --- a/service/kafka/go.mod +++ b/service/kafka/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kafka/go.sum b/service/kafka/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/kafka/go.sum +++ b/service/kafka/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/kafka/serializers.go b/service/kafka/serializers.go index fe550696e52..d1ef7a66bf3 100644 --- a/service/kafka/serializers.go +++ b/service/kafka/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpBatchAssociateScramSecret) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v1/clusters/{ClusterArn}/scram-secrets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -124,13 +119,8 @@ func (m *awsRestjson1_serializeOpBatchDisassociateScramSecret) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/v1/clusters/{ClusterArn}/scram-secrets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -212,13 +202,8 @@ func (m *awsRestjson1_serializeOpCreateCluster) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/clusters") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -349,13 +334,8 @@ func (m *awsRestjson1_serializeOpCreateConfiguration) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/configurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -439,13 +419,8 @@ func (m *awsRestjson1_serializeOpDeleteCluster) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/clusters/{ClusterArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -506,13 +481,8 @@ func (m *awsRestjson1_serializeOpDeleteConfiguration) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/configurations/{Arn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -569,13 +539,8 @@ func (m *awsRestjson1_serializeOpDescribeCluster) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v1/clusters/{ClusterArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -632,13 +597,8 @@ func (m *awsRestjson1_serializeOpDescribeClusterOperation) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/v1/operations/{ClusterOperationArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -695,13 +655,8 @@ func (m *awsRestjson1_serializeOpDescribeConfiguration) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/configurations/{Arn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -758,13 +713,8 @@ func (m *awsRestjson1_serializeOpDescribeConfigurationRevision) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/v1/configurations/{Arn}/revisions/{Revision}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -827,13 +777,8 @@ func (m *awsRestjson1_serializeOpGetBootstrapBrokers) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/clusters/{ClusterArn}/bootstrap-brokers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -890,13 +835,8 @@ func (m *awsRestjson1_serializeOpGetCompatibleKafkaVersions) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v1/compatible-kafka-versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -948,13 +888,8 @@ func (m *awsRestjson1_serializeOpListClusterOperations) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/clusters/{ClusterArn}/operations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1019,13 +954,8 @@ func (m *awsRestjson1_serializeOpListClusters) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/clusters") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1085,13 +1015,8 @@ func (m *awsRestjson1_serializeOpListConfigurationRevisions) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v1/configurations/{Arn}/revisions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1156,13 +1081,8 @@ func (m *awsRestjson1_serializeOpListConfigurations) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/configurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1218,13 +1138,8 @@ func (m *awsRestjson1_serializeOpListKafkaVersions) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v1/kafka-versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1280,13 +1195,8 @@ func (m *awsRestjson1_serializeOpListNodes) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/clusters/{ClusterArn}/nodes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1351,13 +1261,8 @@ func (m *awsRestjson1_serializeOpListScramSecrets) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/clusters/{ClusterArn}/scram-secrets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1422,13 +1327,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1485,13 +1385,8 @@ func (m *awsRestjson1_serializeOpRebootBroker) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/clusters/{ClusterArn}/reboot-broker") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1573,13 +1468,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1661,13 +1551,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1730,13 +1615,8 @@ func (m *awsRestjson1_serializeOpUpdateBrokerCount) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v1/clusters/{ClusterArn}/nodes/count") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1821,13 +1701,8 @@ func (m *awsRestjson1_serializeOpUpdateBrokerStorage) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/clusters/{ClusterArn}/nodes/storage") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1914,13 +1789,8 @@ func (m *awsRestjson1_serializeOpUpdateBrokerType) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/clusters/{ClusterArn}/nodes/type") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2005,13 +1875,8 @@ func (m *awsRestjson1_serializeOpUpdateClusterConfiguration) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v1/clusters/{ClusterArn}/configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2098,13 +1963,8 @@ func (m *awsRestjson1_serializeOpUpdateClusterKafkaVersion) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v1/clusters/{ClusterArn}/version") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2196,13 +2056,8 @@ func (m *awsRestjson1_serializeOpUpdateConfiguration) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/configurations/{Arn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2287,13 +2142,8 @@ func (m *awsRestjson1_serializeOpUpdateMonitoring) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/clusters/{ClusterArn}/monitoring") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/kinesisvideo/go.mod b/service/kinesisvideo/go.mod index 2f3c6a55deb..197c0d2b9bd 100644 --- a/service/kinesisvideo/go.mod +++ b/service/kinesisvideo/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisvideo/go.sum b/service/kinesisvideo/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/kinesisvideo/go.sum +++ b/service/kinesisvideo/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/kinesisvideo/serializers.go b/service/kinesisvideo/serializers.go index 78c00da33f9..61c267aad72 100644 --- a/service/kinesisvideo/serializers.go +++ b/service/kinesisvideo/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateSignalingChannel) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/createSignalingChannel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -128,13 +123,8 @@ func (m *awsRestjson1_serializeOpCreateStream) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/createStream") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -228,13 +218,8 @@ func (m *awsRestjson1_serializeOpDeleteSignalingChannel) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/deleteSignalingChannel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -306,13 +291,8 @@ func (m *awsRestjson1_serializeOpDeleteStream) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/deleteStream") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -384,13 +364,8 @@ func (m *awsRestjson1_serializeOpDescribeSignalingChannel) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/describeSignalingChannel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -462,13 +437,8 @@ func (m *awsRestjson1_serializeOpDescribeStream) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/describeStream") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -540,13 +510,8 @@ func (m *awsRestjson1_serializeOpGetDataEndpoint) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/getDataEndpoint") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -623,13 +588,8 @@ func (m *awsRestjson1_serializeOpGetSignalingChannelEndpoint) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/getSignalingChannelEndpoint") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -703,13 +663,8 @@ func (m *awsRestjson1_serializeOpListSignalingChannels) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/listSignalingChannels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -788,13 +743,8 @@ func (m *awsRestjson1_serializeOpListStreams) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/listStreams") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -873,13 +823,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/ListTagsForResource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -951,13 +896,8 @@ func (m *awsRestjson1_serializeOpListTagsForStream) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/listTagsForStream") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1034,13 +974,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/TagResource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1114,13 +1049,8 @@ func (m *awsRestjson1_serializeOpTagStream) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/tagStream") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1199,13 +1129,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/UntagResource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1279,13 +1204,8 @@ func (m *awsRestjson1_serializeOpUntagStream) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/untagStream") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1364,13 +1284,8 @@ func (m *awsRestjson1_serializeOpUpdateDataRetention) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/updateDataRetention") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1457,13 +1372,8 @@ func (m *awsRestjson1_serializeOpUpdateSignalingChannel) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/updateSignalingChannel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1542,13 +1452,8 @@ func (m *awsRestjson1_serializeOpUpdateStream) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/updateStream") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/kinesisvideoarchivedmedia/go.mod b/service/kinesisvideoarchivedmedia/go.mod index 5bc5aa15b30..e40194062d4 100644 --- a/service/kinesisvideoarchivedmedia/go.mod +++ b/service/kinesisvideoarchivedmedia/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisvideoarchivedmedia/go.sum b/service/kinesisvideoarchivedmedia/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/kinesisvideoarchivedmedia/go.sum +++ b/service/kinesisvideoarchivedmedia/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/kinesisvideoarchivedmedia/serializers.go b/service/kinesisvideoarchivedmedia/serializers.go index edadf00e22a..738ca99f182 100644 --- a/service/kinesisvideoarchivedmedia/serializers.go +++ b/service/kinesisvideoarchivedmedia/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpGetClip) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/getClip") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -122,13 +117,8 @@ func (m *awsRestjson1_serializeOpGetDASHStreamingSessionURL) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/getDASHStreamingSessionURL") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -232,13 +222,8 @@ func (m *awsRestjson1_serializeOpGetHLSStreamingSessionURL) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/getHLSStreamingSessionURL") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -347,13 +332,8 @@ func (m *awsRestjson1_serializeOpGetMediaForFragmentList) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/getMediaForFragmentList") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -432,13 +412,8 @@ func (m *awsRestjson1_serializeOpListFragments) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/listFragments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/kinesisvideomedia/go.mod b/service/kinesisvideomedia/go.mod index 47d6d9487db..fcc6307c180 100644 --- a/service/kinesisvideomedia/go.mod +++ b/service/kinesisvideomedia/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisvideomedia/go.sum b/service/kinesisvideomedia/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/kinesisvideomedia/go.sum +++ b/service/kinesisvideomedia/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/kinesisvideomedia/serializers.go b/service/kinesisvideomedia/serializers.go index fda5bdbea6a..0f4d41f544b 100644 --- a/service/kinesisvideomedia/serializers.go +++ b/service/kinesisvideomedia/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpGetMedia) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/getMedia") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/kinesisvideosignaling/go.mod b/service/kinesisvideosignaling/go.mod index 34e7ac3e854..afa46692de3 100644 --- a/service/kinesisvideosignaling/go.mod +++ b/service/kinesisvideosignaling/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/kinesisvideosignaling/go.sum b/service/kinesisvideosignaling/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/kinesisvideosignaling/go.sum +++ b/service/kinesisvideosignaling/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/kinesisvideosignaling/serializers.go b/service/kinesisvideosignaling/serializers.go index 048baf935a5..17b17b1be49 100644 --- a/service/kinesisvideosignaling/serializers.go +++ b/service/kinesisvideosignaling/serializers.go @@ -35,13 +35,8 @@ func (m *awsRestjson1_serializeOpGetIceServerConfig) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/get-ice-server-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -123,13 +118,8 @@ func (m *awsRestjson1_serializeOpSendAlexaOfferToMaster) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v1/send-alexa-offer-to-master") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/lambda/go.mod b/service/lambda/go.mod index 949e998316a..3000319bdaa 100644 --- a/service/lambda/go.mod +++ b/service/lambda/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/lambda/go.sum b/service/lambda/go.sum index d937214c3eb..9ddcad9aa66 100644 --- a/service/lambda/go.sum +++ b/service/lambda/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= 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.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= diff --git a/service/lambda/serializers.go b/service/lambda/serializers.go index dda060779c4..cfe9dcd90f6 100644 --- a/service/lambda/serializers.go +++ b/service/lambda/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpAddLayerVersionPermission) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2018-10-31/layers/{LayerName}/versions/{VersionNumber}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -148,13 +143,8 @@ func (m *awsRestjson1_serializeOpAddPermission) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -268,13 +258,8 @@ func (m *awsRestjson1_serializeOpCreateAlias) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}/aliases") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -371,13 +356,8 @@ func (m *awsRestjson1_serializeOpCreateCodeSigningConfig) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/2020-04-22/code-signing-configs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -458,13 +438,8 @@ func (m *awsRestjson1_serializeOpCreateEventSourceMapping) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/event-source-mappings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -628,13 +603,8 @@ func (m *awsRestjson1_serializeOpCreateFunction) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -814,13 +784,8 @@ func (m *awsRestjson1_serializeOpDeleteAlias) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}/aliases/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -886,13 +851,8 @@ func (m *awsRestjson1_serializeOpDeleteCodeSigningConfig) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/2020-04-22/code-signing-configs/{CodeSigningConfigArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -949,13 +909,8 @@ func (m *awsRestjson1_serializeOpDeleteEventSourceMapping) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/event-source-mappings/{UUID}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1012,13 +967,8 @@ func (m *awsRestjson1_serializeOpDeleteFunction) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1079,13 +1029,8 @@ func (m *awsRestjson1_serializeOpDeleteFunctionCodeSigningConfig) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/2020-06-30/functions/{FunctionName}/code-signing-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1142,13 +1087,8 @@ func (m *awsRestjson1_serializeOpDeleteFunctionConcurrency) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2017-10-31/functions/{FunctionName}/concurrency") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1205,13 +1145,8 @@ func (m *awsRestjson1_serializeOpDeleteFunctionEventInvokeConfig) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/2019-09-25/functions/{FunctionName}/event-invoke-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1272,13 +1207,8 @@ func (m *awsRestjson1_serializeOpDeleteLayerVersion) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/2018-10-31/layers/{LayerName}/versions/{VersionNumber}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1341,13 +1271,8 @@ func (m *awsRestjson1_serializeOpDeleteProvisionedConcurrencyConfig) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/2019-09-30/functions/{FunctionName}/provisioned-concurrency") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1408,13 +1333,8 @@ func (m *awsRestjson1_serializeOpGetAccountSettings) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/2016-08-19/account-settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1458,13 +1378,8 @@ func (m *awsRestjson1_serializeOpGetAlias) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}/aliases/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1530,13 +1445,8 @@ func (m *awsRestjson1_serializeOpGetCodeSigningConfig) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/2020-04-22/code-signing-configs/{CodeSigningConfigArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1593,13 +1503,8 @@ func (m *awsRestjson1_serializeOpGetEventSourceMapping) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/event-source-mappings/{UUID}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1656,13 +1561,8 @@ func (m *awsRestjson1_serializeOpGetFunction) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1723,13 +1623,8 @@ func (m *awsRestjson1_serializeOpGetFunctionCodeSigningConfig) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/2020-06-30/functions/{FunctionName}/code-signing-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1786,13 +1681,8 @@ func (m *awsRestjson1_serializeOpGetFunctionConcurrency) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/2019-09-30/functions/{FunctionName}/concurrency") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1849,13 +1739,8 @@ func (m *awsRestjson1_serializeOpGetFunctionConfiguration) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}/configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1916,13 +1801,8 @@ func (m *awsRestjson1_serializeOpGetFunctionEventInvokeConfig) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/2019-09-25/functions/{FunctionName}/event-invoke-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1983,13 +1863,8 @@ func (m *awsRestjson1_serializeOpGetLayerVersion) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2018-10-31/layers/{LayerName}/versions/{VersionNumber}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2052,13 +1927,8 @@ func (m *awsRestjson1_serializeOpGetLayerVersionByArn) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/2018-10-31/layers?find=LayerVersion") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2110,13 +1980,8 @@ func (m *awsRestjson1_serializeOpGetLayerVersionPolicy) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/2018-10-31/layers/{LayerName}/versions/{VersionNumber}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2179,13 +2044,8 @@ func (m *awsRestjson1_serializeOpGetPolicy) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2246,13 +2106,8 @@ func (m *awsRestjson1_serializeOpGetProvisionedConcurrencyConfig) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/2019-09-30/functions/{FunctionName}/provisioned-concurrency") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2313,13 +2168,8 @@ func (m *awsRestjson1_serializeOpInvoke) HandleSerialize(ctx context.Context, in } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}/invocations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2406,13 +2256,8 @@ func (m *awsRestjson1_serializeOpInvokeAsync) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2014-11-13/functions/{FunctionName}/invoke-async") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2480,13 +2325,8 @@ func (m *awsRestjson1_serializeOpListAliases) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}/aliases") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2555,13 +2395,8 @@ func (m *awsRestjson1_serializeOpListCodeSigningConfigs) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/2020-04-22/code-signing-configs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2617,13 +2452,8 @@ func (m *awsRestjson1_serializeOpListEventSourceMappings) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/event-source-mappings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2687,13 +2517,8 @@ func (m *awsRestjson1_serializeOpListFunctionEventInvokeConfigs) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/2019-09-25/functions/{FunctionName}/event-invoke-config/list") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2758,13 +2583,8 @@ func (m *awsRestjson1_serializeOpListFunctions) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2828,13 +2648,8 @@ func (m *awsRestjson1_serializeOpListFunctionsByCodeSigningConfig) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/2020-04-22/code-signing-configs/{CodeSigningConfigArn}/functions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2899,13 +2714,8 @@ func (m *awsRestjson1_serializeOpListLayers) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/2018-10-31/layers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2965,13 +2775,8 @@ func (m *awsRestjson1_serializeOpListLayerVersions) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2018-10-31/layers/{LayerName}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3040,13 +2845,8 @@ func (m *awsRestjson1_serializeOpListProvisionedConcurrencyConfigs) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/2019-09-30/functions/{FunctionName}/provisioned-concurrency?List=ALL") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3111,13 +2911,8 @@ func (m *awsRestjson1_serializeOpListTags) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/2017-03-31/tags/{Resource}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3174,13 +2969,8 @@ func (m *awsRestjson1_serializeOpListVersionsByFunction) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3245,13 +3035,8 @@ func (m *awsRestjson1_serializeOpPublishLayerVersion) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/2018-10-31/layers/{LayerName}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3350,13 +3135,8 @@ func (m *awsRestjson1_serializeOpPublishVersion) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3446,13 +3226,8 @@ func (m *awsRestjson1_serializeOpPutFunctionCodeSigningConfig) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/2020-06-30/functions/{FunctionName}/code-signing-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3532,13 +3307,8 @@ func (m *awsRestjson1_serializeOpPutFunctionConcurrency) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/2017-10-31/functions/{FunctionName}/concurrency") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3618,13 +3388,8 @@ func (m *awsRestjson1_serializeOpPutFunctionEventInvokeConfig) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/2019-09-25/functions/{FunctionName}/event-invoke-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3720,13 +3485,8 @@ func (m *awsRestjson1_serializeOpPutProvisionedConcurrencyConfig) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/2019-09-30/functions/{FunctionName}/provisioned-concurrency") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3810,13 +3570,8 @@ func (m *awsRestjson1_serializeOpRemoveLayerVersionPermission) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/2018-10-31/layers/{LayerName}/versions/{VersionNumber}/policy/{StatementId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3892,13 +3647,8 @@ func (m *awsRestjson1_serializeOpRemovePermission) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}/policy/{StatementId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3972,13 +3722,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2017-03-31/tags/{Resource}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4060,13 +3805,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2017-03-31/tags/{Resource}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4129,13 +3869,8 @@ func (m *awsRestjson1_serializeOpUpdateAlias) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}/aliases/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4241,13 +3976,8 @@ func (m *awsRestjson1_serializeOpUpdateCodeSigningConfig) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/2020-04-22/code-signing-configs/{CodeSigningConfigArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4341,13 +4071,8 @@ func (m *awsRestjson1_serializeOpUpdateEventSourceMapping) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/event-source-mappings/{UUID}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4488,13 +4213,8 @@ func (m *awsRestjson1_serializeOpUpdateFunctionCode) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}/code") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4609,13 +4329,8 @@ func (m *awsRestjson1_serializeOpUpdateFunctionConfiguration) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/2015-03-31/functions/{FunctionName}/configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4779,13 +4494,8 @@ func (m *awsRestjson1_serializeOpUpdateFunctionEventInvokeConfig) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/2019-09-25/functions/{FunctionName}/event-invoke-config") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/lexmodelbuildingservice/go.mod b/service/lexmodelbuildingservice/go.mod index 12f68319f59..8ecef9ce9c1 100644 --- a/service/lexmodelbuildingservice/go.mod +++ b/service/lexmodelbuildingservice/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lexmodelbuildingservice/go.sum b/service/lexmodelbuildingservice/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/lexmodelbuildingservice/go.sum +++ b/service/lexmodelbuildingservice/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/lexmodelbuildingservice/serializers.go b/service/lexmodelbuildingservice/serializers.go index e3db389377b..38060f1f399 100644 --- a/service/lexmodelbuildingservice/serializers.go +++ b/service/lexmodelbuildingservice/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateBotVersion) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/bots/{name}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -122,13 +117,8 @@ func (m *awsRestjson1_serializeOpCreateIntentVersion) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/intents/{name}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -208,13 +198,8 @@ func (m *awsRestjson1_serializeOpCreateSlotTypeVersion) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/slottypes/{name}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -294,13 +279,8 @@ func (m *awsRestjson1_serializeOpDeleteBot) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/bots/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -357,13 +337,8 @@ func (m *awsRestjson1_serializeOpDeleteBotAlias) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/bots/{botName}/aliases/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -429,13 +404,8 @@ func (m *awsRestjson1_serializeOpDeleteBotChannelAssociation) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/bots/{botName}/aliases/{botAlias}/channels/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -510,13 +480,8 @@ func (m *awsRestjson1_serializeOpDeleteBotVersion) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/bots/{name}/versions/{version}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -582,13 +547,8 @@ func (m *awsRestjson1_serializeOpDeleteIntent) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/intents/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -645,13 +605,8 @@ func (m *awsRestjson1_serializeOpDeleteIntentVersion) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/intents/{name}/versions/{version}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -717,13 +672,8 @@ func (m *awsRestjson1_serializeOpDeleteSlotType) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/slottypes/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -780,13 +730,8 @@ func (m *awsRestjson1_serializeOpDeleteSlotTypeVersion) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/slottypes/{name}/version/{version}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -852,13 +797,8 @@ func (m *awsRestjson1_serializeOpDeleteUtterances) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/bots/{botName}/utterances/{userId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -924,13 +864,8 @@ func (m *awsRestjson1_serializeOpGetBot) HandleSerialize(ctx context.Context, in } opPath, opQuery := httpbinding.SplitURI("/bots/{name}/versions/{versionOrAlias}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -996,13 +931,8 @@ func (m *awsRestjson1_serializeOpGetBotAlias) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/bots/{botName}/aliases/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1068,13 +998,8 @@ func (m *awsRestjson1_serializeOpGetBotAliases) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/bots/{botName}/aliases") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1143,13 +1068,8 @@ func (m *awsRestjson1_serializeOpGetBotChannelAssociation) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/bots/{botName}/aliases/{botAlias}/channels/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1224,13 +1144,8 @@ func (m *awsRestjson1_serializeOpGetBotChannelAssociations) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/bots/{botName}/aliases/{botAlias}/channels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1308,13 +1223,8 @@ func (m *awsRestjson1_serializeOpGetBots) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/bots") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1374,13 +1284,8 @@ func (m *awsRestjson1_serializeOpGetBotVersions) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/bots/{name}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1445,13 +1350,8 @@ func (m *awsRestjson1_serializeOpGetBuiltinIntent) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/builtins/intents/{signature}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1508,13 +1408,8 @@ func (m *awsRestjson1_serializeOpGetBuiltinIntents) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/builtins/intents") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1578,13 +1473,8 @@ func (m *awsRestjson1_serializeOpGetBuiltinSlotTypes) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/builtins/slottypes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1648,13 +1538,8 @@ func (m *awsRestjson1_serializeOpGetExport) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/exports") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1718,13 +1603,8 @@ func (m *awsRestjson1_serializeOpGetImport) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/imports/{importId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1781,13 +1661,8 @@ func (m *awsRestjson1_serializeOpGetIntent) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/intents/{name}/versions/{version}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1853,13 +1728,8 @@ func (m *awsRestjson1_serializeOpGetIntents) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/intents") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1919,13 +1789,8 @@ func (m *awsRestjson1_serializeOpGetIntentVersions) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/intents/{name}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1990,13 +1855,8 @@ func (m *awsRestjson1_serializeOpGetSlotType) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/slottypes/{name}/versions/{version}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2062,13 +1922,8 @@ func (m *awsRestjson1_serializeOpGetSlotTypes) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/slottypes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2128,13 +1983,8 @@ func (m *awsRestjson1_serializeOpGetSlotTypeVersions) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/slottypes/{name}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2199,13 +2049,8 @@ func (m *awsRestjson1_serializeOpGetUtterancesView) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/bots/{botName}/utterances?view=aggregation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2272,13 +2117,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2335,13 +2175,8 @@ func (m *awsRestjson1_serializeOpPutBot) HandleSerialize(ctx context.Context, in } opPath, opQuery := httpbinding.SplitURI("/bots/{name}/versions/$LATEST") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2499,13 +2334,8 @@ func (m *awsRestjson1_serializeOpPutBotAlias) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/bots/{botName}/aliases/{name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2618,13 +2448,8 @@ func (m *awsRestjson1_serializeOpPutIntent) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/intents/{name}/versions/$LATEST") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2796,13 +2621,8 @@ func (m *awsRestjson1_serializeOpPutSlotType) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/slottypes/{name}/versions/$LATEST") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2916,13 +2736,8 @@ func (m *awsRestjson1_serializeOpStartImport) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/imports") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3006,13 +2821,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3094,13 +2904,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/lexmodelsv2/go.mod b/service/lexmodelsv2/go.mod index 4b22e5a12f1..0ddaf08c5a4 100644 --- a/service/lexmodelsv2/go.mod +++ b/service/lexmodelsv2/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lexmodelsv2/go.sum b/service/lexmodelsv2/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/lexmodelsv2/go.sum +++ b/service/lexmodelsv2/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/lexmodelsv2/serializers.go b/service/lexmodelsv2/serializers.go index 5f9fb9bcff7..f694bbff705 100644 --- a/service/lexmodelsv2/serializers.go +++ b/service/lexmodelsv2/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpBuildBotLocale) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -117,13 +112,8 @@ func (m *awsRestjson1_serializeOpCreateBot) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/bots") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -226,13 +216,8 @@ func (m *awsRestjson1_serializeOpCreateBotAlias) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botaliases") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -350,13 +335,8 @@ func (m *awsRestjson1_serializeOpCreateBotLocale) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -462,13 +442,8 @@ func (m *awsRestjson1_serializeOpCreateBotVersion) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -555,13 +530,8 @@ func (m *awsRestjson1_serializeOpCreateIntent) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}/intents") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -725,13 +695,8 @@ func (m *awsRestjson1_serializeOpCreateSlot) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}/intents/{intentId}/slots") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -862,13 +827,8 @@ func (m *awsRestjson1_serializeOpCreateSlotType) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}/slottypes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -990,13 +950,8 @@ func (m *awsRestjson1_serializeOpDeleteBot) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1057,13 +1012,8 @@ func (m *awsRestjson1_serializeOpDeleteBotAlias) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botaliases/{botAliasId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1133,13 +1083,8 @@ func (m *awsRestjson1_serializeOpDeleteBotLocale) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1214,13 +1159,8 @@ func (m *awsRestjson1_serializeOpDeleteBotVersion) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1290,13 +1230,8 @@ func (m *awsRestjson1_serializeOpDeleteIntent) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}/intents/{intentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1380,13 +1315,8 @@ func (m *awsRestjson1_serializeOpDeleteSlot) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}/intents/{intentId}/slots/{slotId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1479,13 +1409,8 @@ func (m *awsRestjson1_serializeOpDeleteSlotType) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}/slottypes/{slotTypeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1573,13 +1498,8 @@ func (m *awsRestjson1_serializeOpDescribeBot) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1636,13 +1556,8 @@ func (m *awsRestjson1_serializeOpDescribeBotAlias) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botaliases/{botAliasId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1708,13 +1623,8 @@ func (m *awsRestjson1_serializeOpDescribeBotLocale) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1789,13 +1699,8 @@ func (m *awsRestjson1_serializeOpDescribeBotVersion) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1861,13 +1766,8 @@ func (m *awsRestjson1_serializeOpDescribeIntent) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}/intents/{intentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1951,13 +1851,8 @@ func (m *awsRestjson1_serializeOpDescribeSlot) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}/intents/{intentId}/slots/{slotId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2050,13 +1945,8 @@ func (m *awsRestjson1_serializeOpDescribeSlotType) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}/slottypes/{slotTypeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2140,13 +2030,8 @@ func (m *awsRestjson1_serializeOpListBotAliases) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botaliases") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2231,13 +2116,8 @@ func (m *awsRestjson1_serializeOpListBotLocales) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2345,13 +2225,8 @@ func (m *awsRestjson1_serializeOpListBots) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/bots") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2437,13 +2312,8 @@ func (m *awsRestjson1_serializeOpListBotVersions) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2535,13 +2405,8 @@ func (m *awsRestjson1_serializeOpListBuiltInIntents) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/builtins/locales/{localeId}/intents") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2633,13 +2498,8 @@ func (m *awsRestjson1_serializeOpListBuiltInSlotTypes) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/builtins/locales/{localeId}/slottypes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2731,13 +2591,8 @@ func (m *awsRestjson1_serializeOpListIntents) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}/intents") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2854,13 +2709,8 @@ func (m *awsRestjson1_serializeOpListSlots) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}/intents/{intentId}/slots") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2986,13 +2836,8 @@ func (m *awsRestjson1_serializeOpListSlotTypes) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}/slottypes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3109,13 +2954,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceARN}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3172,13 +3012,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceARN}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3260,13 +3095,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceARN}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3329,13 +3159,8 @@ func (m *awsRestjson1_serializeOpUpdateBot) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3437,13 +3262,8 @@ func (m *awsRestjson1_serializeOpUpdateBotAlias) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botaliases/{botAliasId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3563,13 +3383,8 @@ func (m *awsRestjson1_serializeOpUpdateBotLocale) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3679,13 +3494,8 @@ func (m *awsRestjson1_serializeOpUpdateIntent) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}/intents/{intentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3865,13 +3675,8 @@ func (m *awsRestjson1_serializeOpUpdateSlot) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}/intents/{intentId}/slots/{slotId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4011,13 +3816,8 @@ func (m *awsRestjson1_serializeOpUpdateSlotType) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botversions/{botVersion}/botlocales/{localeId}/slottypes/{slotTypeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/lexruntimeservice/go.mod b/service/lexruntimeservice/go.mod index bbde04272aa..fb7bc97a4d3 100644 --- a/service/lexruntimeservice/go.mod +++ b/service/lexruntimeservice/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lexruntimeservice/go.sum b/service/lexruntimeservice/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/lexruntimeservice/go.sum +++ b/service/lexruntimeservice/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/lexruntimeservice/serializers.go b/service/lexruntimeservice/serializers.go index 93a69c66c88..05c96335469 100644 --- a/service/lexruntimeservice/serializers.go +++ b/service/lexruntimeservice/serializers.go @@ -38,13 +38,8 @@ func (m *awsRestjson1_serializeOpDeleteSession) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/bot/{botName}/alias/{botAlias}/user/{userId}/session") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -119,13 +114,8 @@ func (m *awsRestjson1_serializeOpGetSession) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/bot/{botName}/alias/{botAlias}/user/{userId}/session") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -204,13 +194,8 @@ func (m *awsRestjson1_serializeOpPostContent) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/bot/{botName}/alias/{botAlias}/user/{userId}/content") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -324,13 +309,8 @@ func (m *awsRestjson1_serializeOpPostText) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/bot/{botName}/alias/{botAlias}/user/{userId}/text") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -449,13 +429,8 @@ func (m *awsRestjson1_serializeOpPutSession) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/bot/{botName}/alias/{botAlias}/user/{userId}/session") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/lexruntimev2/go.mod b/service/lexruntimev2/go.mod index 9e202775f93..9706fb5e1e8 100644 --- a/service/lexruntimev2/go.mod +++ b/service/lexruntimev2/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lexruntimev2/go.sum b/service/lexruntimev2/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/lexruntimev2/go.sum +++ b/service/lexruntimev2/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/lexruntimev2/serializers.go b/service/lexruntimev2/serializers.go index 70093588230..f3837c7f7ce 100644 --- a/service/lexruntimev2/serializers.go +++ b/service/lexruntimev2/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpDeleteSession) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botAliases/{botAliasId}/botLocales/{localeId}/sessions/{sessionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -126,13 +121,8 @@ func (m *awsRestjson1_serializeOpGetSession) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botAliases/{botAliasId}/botLocales/{localeId}/sessions/{sessionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -216,13 +206,8 @@ func (m *awsRestjson1_serializeOpPutSession) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botAliases/{botAliasId}/botLocales/{localeId}/sessions/{sessionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -350,13 +335,8 @@ func (m *awsRestjson1_serializeOpRecognizeText) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botAliases/{botAliasId}/botLocales/{localeId}/sessions/{sessionId}/text") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -477,13 +457,8 @@ func (m *awsRestjson1_serializeOpRecognizeUtterance) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/botAliases/{botAliasId}/botLocales/{localeId}/sessions/{sessionId}/utterance") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/lookoutvision/go.mod b/service/lookoutvision/go.mod index 2f297998720..9489e4281cf 100644 --- a/service/lookoutvision/go.mod +++ b/service/lookoutvision/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/lookoutvision/go.sum b/service/lookoutvision/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/lookoutvision/go.sum +++ b/service/lookoutvision/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/lookoutvision/serializers.go b/service/lookoutvision/serializers.go index 7f6bd29c231..38533fbe07c 100644 --- a/service/lookoutvision/serializers.go +++ b/service/lookoutvision/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpCreateDataset) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects/{ProjectName}/datasets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -135,13 +130,8 @@ func (m *awsRestjson1_serializeOpCreateModel) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects/{ProjectName}/models") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -245,13 +235,8 @@ func (m *awsRestjson1_serializeOpCreateProject) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -327,13 +312,8 @@ func (m *awsRestjson1_serializeOpDeleteDataset) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects/{ProjectName}/datasets/{DatasetType}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -404,13 +384,8 @@ func (m *awsRestjson1_serializeOpDeleteModel) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects/{ProjectName}/models/{ModelVersion}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -481,13 +456,8 @@ func (m *awsRestjson1_serializeOpDeleteProject) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects/{ProjectName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -549,13 +519,8 @@ func (m *awsRestjson1_serializeOpDescribeDataset) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects/{ProjectName}/datasets/{DatasetType}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -621,13 +586,8 @@ func (m *awsRestjson1_serializeOpDescribeModel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects/{ProjectName}/models/{ModelVersion}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -693,13 +653,8 @@ func (m *awsRestjson1_serializeOpDescribeProject) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects/{ProjectName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -756,13 +711,8 @@ func (m *awsRestjson1_serializeOpDetectAnomalies) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects/{ProjectName}/models/{ModelVersion}/detect") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -844,13 +794,8 @@ func (m *awsRestjson1_serializeOpListDatasetEntries) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects/{ProjectName}/datasets/{DatasetType}/entries") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -944,13 +889,8 @@ func (m *awsRestjson1_serializeOpListModels) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects/{ProjectName}/models") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1015,13 +955,8 @@ func (m *awsRestjson1_serializeOpListProjects) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1077,13 +1012,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1140,13 +1070,8 @@ func (m *awsRestjson1_serializeOpStartModel) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects/{ProjectName}/models/{ModelVersion}/start") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1240,13 +1165,8 @@ func (m *awsRestjson1_serializeOpStopModel) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects/{ProjectName}/models/{ModelVersion}/stop") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1317,13 +1237,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1405,13 +1320,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1474,13 +1384,8 @@ func (m *awsRestjson1_serializeOpUpdateDatasetEntries) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/2020-11-20/projects/{ProjectName}/datasets/{DatasetType}/entries") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/macie2/go.mod b/service/macie2/go.mod index ef8bc1daa3e..2dbbd8af052 100644 --- a/service/macie2/go.mod +++ b/service/macie2/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/macie2/go.sum b/service/macie2/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/macie2/go.sum +++ b/service/macie2/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/macie2/serializers.go b/service/macie2/serializers.go index 0be81f3258e..ddf4455d14b 100644 --- a/service/macie2/serializers.go +++ b/service/macie2/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAcceptInvitation) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/invitations/accept") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -119,13 +114,8 @@ func (m *awsRestjson1_serializeOpBatchGetCustomDataIdentifiers) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/custom-data-identifiers/get") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -194,13 +184,8 @@ func (m *awsRestjson1_serializeOpCreateClassificationJob) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -320,13 +305,8 @@ func (m *awsRestjson1_serializeOpCreateCustomDataIdentifier) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/custom-data-identifiers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -434,13 +414,8 @@ func (m *awsRestjson1_serializeOpCreateFindingsFilter) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/findingsfilters") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -541,13 +516,8 @@ func (m *awsRestjson1_serializeOpCreateInvitations) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/invitations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -626,13 +596,8 @@ func (m *awsRestjson1_serializeOpCreateMember) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/members") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -708,13 +673,8 @@ func (m *awsRestjson1_serializeOpCreateSampleFindings) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/findings/sample") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -783,13 +743,8 @@ func (m *awsRestjson1_serializeOpDeclineInvitations) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/invitations/decline") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -858,13 +813,8 @@ func (m *awsRestjson1_serializeOpDeleteCustomDataIdentifier) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/custom-data-identifiers/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -921,13 +871,8 @@ func (m *awsRestjson1_serializeOpDeleteFindingsFilter) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/findingsfilters/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -984,13 +929,8 @@ func (m *awsRestjson1_serializeOpDeleteInvitations) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/invitations/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1059,13 +999,8 @@ func (m *awsRestjson1_serializeOpDeleteMember) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/members/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1122,13 +1057,8 @@ func (m *awsRestjson1_serializeOpDescribeBuckets) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/datasources/s3") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1214,13 +1144,8 @@ func (m *awsRestjson1_serializeOpDescribeClassificationJob) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/jobs/{jobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1277,13 +1202,8 @@ func (m *awsRestjson1_serializeOpDescribeOrganizationConfiguration) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/admin/configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1327,13 +1247,8 @@ func (m *awsRestjson1_serializeOpDisableMacie) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/macie") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1377,13 +1292,8 @@ func (m *awsRestjson1_serializeOpDisableOrganizationAdminAccount) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/admin") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1435,13 +1345,8 @@ func (m *awsRestjson1_serializeOpDisassociateFromAdministratorAccount) HandleSer } opPath, opQuery := httpbinding.SplitURI("/administrator/disassociate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1485,13 +1390,8 @@ func (m *awsRestjson1_serializeOpDisassociateFromMasterAccount) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/master/disassociate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1535,13 +1435,8 @@ func (m *awsRestjson1_serializeOpDisassociateMember) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/members/disassociate/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1598,13 +1493,8 @@ func (m *awsRestjson1_serializeOpEnableMacie) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/macie") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1681,13 +1571,8 @@ func (m *awsRestjson1_serializeOpEnableOrganizationAdminAccount) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/admin") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1759,13 +1644,8 @@ func (m *awsRestjson1_serializeOpGetAdministratorAccount) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/administrator") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1809,13 +1689,8 @@ func (m *awsRestjson1_serializeOpGetBucketStatistics) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/datasources/s3/statistics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1882,13 +1757,8 @@ func (m *awsRestjson1_serializeOpGetClassificationExportConfiguration) HandleSer } opPath, opQuery := httpbinding.SplitURI("/classification-export-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1932,13 +1802,8 @@ func (m *awsRestjson1_serializeOpGetCustomDataIdentifier) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/custom-data-identifiers/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1995,13 +1860,8 @@ func (m *awsRestjson1_serializeOpGetFindings) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/findings/describe") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2077,13 +1937,8 @@ func (m *awsRestjson1_serializeOpGetFindingsFilter) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/findingsfilters/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2140,13 +1995,8 @@ func (m *awsRestjson1_serializeOpGetFindingStatistics) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/findings/statistics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2232,13 +2082,8 @@ func (m *awsRestjson1_serializeOpGetInvitationsCount) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/invitations/count") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2282,13 +2127,8 @@ func (m *awsRestjson1_serializeOpGetMacieSession) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/macie") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2332,13 +2172,8 @@ func (m *awsRestjson1_serializeOpGetMasterAccount) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/master") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2382,13 +2217,8 @@ func (m *awsRestjson1_serializeOpGetMember) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/members/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2445,13 +2275,8 @@ func (m *awsRestjson1_serializeOpGetUsageStatistics) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/usage/statistics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2542,13 +2367,8 @@ func (m *awsRestjson1_serializeOpGetUsageTotals) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/usage") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2600,13 +2420,8 @@ func (m *awsRestjson1_serializeOpListClassificationJobs) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/jobs/list") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2692,13 +2507,8 @@ func (m *awsRestjson1_serializeOpListCustomDataIdentifiers) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/custom-data-identifiers/list") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2770,13 +2580,8 @@ func (m *awsRestjson1_serializeOpListFindings) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/findings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2862,13 +2667,8 @@ func (m *awsRestjson1_serializeOpListFindingsFilters) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/findingsfilters") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2924,13 +2724,8 @@ func (m *awsRestjson1_serializeOpListInvitations) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/invitations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2986,13 +2781,8 @@ func (m *awsRestjson1_serializeOpListMembers) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/members") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3052,13 +2842,8 @@ func (m *awsRestjson1_serializeOpListOrganizationAdminAccounts) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/admin") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3114,13 +2899,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3177,13 +2957,8 @@ func (m *awsRestjson1_serializeOpPutClassificationExportConfiguration) HandleSer } opPath, opQuery := httpbinding.SplitURI("/classification-export-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3252,13 +3027,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3340,13 +3110,8 @@ func (m *awsRestjson1_serializeOpTestCustomDataIdentifier) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/custom-data-identifiers/test") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3437,13 +3202,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3506,13 +3266,8 @@ func (m *awsRestjson1_serializeOpUpdateClassificationJob) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/jobs/{jobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3592,13 +3347,8 @@ func (m *awsRestjson1_serializeOpUpdateFindingsFilter) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/findingsfilters/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3700,13 +3450,8 @@ func (m *awsRestjson1_serializeOpUpdateMacieSession) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/macie") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3778,13 +3523,8 @@ func (m *awsRestjson1_serializeOpUpdateMemberSession) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/macie/members/{id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3864,13 +3604,8 @@ func (m *awsRestjson1_serializeOpUpdateOrganizationConfiguration) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/admin/configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/managedblockchain/go.mod b/service/managedblockchain/go.mod index 0f2aa221223..a392ad265c3 100644 --- a/service/managedblockchain/go.mod +++ b/service/managedblockchain/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/managedblockchain/go.sum b/service/managedblockchain/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/managedblockchain/go.sum +++ b/service/managedblockchain/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/managedblockchain/serializers.go b/service/managedblockchain/serializers.go index 7bf46244b67..575c8bac8af 100644 --- a/service/managedblockchain/serializers.go +++ b/service/managedblockchain/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateMember) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}/members") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -134,13 +129,8 @@ func (m *awsRestjson1_serializeOpCreateNetwork) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/networks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -255,13 +245,8 @@ func (m *awsRestjson1_serializeOpCreateNode) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}/nodes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -360,13 +345,8 @@ func (m *awsRestjson1_serializeOpCreateProposal) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}/proposals") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -470,13 +450,8 @@ func (m *awsRestjson1_serializeOpDeleteMember) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}/members/{MemberId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -542,13 +517,8 @@ func (m *awsRestjson1_serializeOpDeleteNode) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}/nodes/{NodeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -618,13 +588,8 @@ func (m *awsRestjson1_serializeOpGetMember) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}/members/{MemberId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -690,13 +655,8 @@ func (m *awsRestjson1_serializeOpGetNetwork) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -753,13 +713,8 @@ func (m *awsRestjson1_serializeOpGetNode) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}/nodes/{NodeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -829,13 +784,8 @@ func (m *awsRestjson1_serializeOpGetProposal) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}/proposals/{ProposalId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -901,13 +851,8 @@ func (m *awsRestjson1_serializeOpListInvitations) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/invitations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -963,13 +908,8 @@ func (m *awsRestjson1_serializeOpListMembers) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}/members") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1046,13 +986,8 @@ func (m *awsRestjson1_serializeOpListNetworks) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/networks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1120,13 +1055,8 @@ func (m *awsRestjson1_serializeOpListNodes) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}/nodes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1199,13 +1129,8 @@ func (m *awsRestjson1_serializeOpListProposals) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}/proposals") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1270,13 +1195,8 @@ func (m *awsRestjson1_serializeOpListProposalVotes) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}/proposals/{ProposalId}/votes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1350,13 +1270,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1413,13 +1328,8 @@ func (m *awsRestjson1_serializeOpRejectInvitation) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/invitations/{InvitationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1476,13 +1386,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1564,13 +1469,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1633,13 +1533,8 @@ func (m *awsRestjson1_serializeOpUpdateMember) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}/members/{MemberId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1730,13 +1625,8 @@ func (m *awsRestjson1_serializeOpUpdateNode) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}/nodes/{NodeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1832,13 +1722,8 @@ func (m *awsRestjson1_serializeOpVoteOnProposal) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/networks/{NetworkId}/proposals/{ProposalId}/votes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/marketplacecatalog/go.mod b/service/marketplacecatalog/go.mod index bf50ce0c782..42776151de7 100644 --- a/service/marketplacecatalog/go.mod +++ b/service/marketplacecatalog/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/marketplacecatalog/go.sum b/service/marketplacecatalog/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/marketplacecatalog/go.sum +++ b/service/marketplacecatalog/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/marketplacecatalog/serializers.go b/service/marketplacecatalog/serializers.go index c2754d08fc6..16d9854b5df 100644 --- a/service/marketplacecatalog/serializers.go +++ b/service/marketplacecatalog/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCancelChangeSet) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/CancelChangeSet") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -98,13 +93,8 @@ func (m *awsRestjson1_serializeOpDescribeChangeSet) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/DescribeChangeSet") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -160,13 +150,8 @@ func (m *awsRestjson1_serializeOpDescribeEntity) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/DescribeEntity") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -222,13 +207,8 @@ func (m *awsRestjson1_serializeOpListChangeSets) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/ListChangeSets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -319,13 +299,8 @@ func (m *awsRestjson1_serializeOpListEntities) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/ListEntities") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -421,13 +396,8 @@ func (m *awsRestjson1_serializeOpStartChangeSet) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/StartChangeSet") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/mediaconnect/go.mod b/service/mediaconnect/go.mod index 10f6b668411..24a997981c4 100644 --- a/service/mediaconnect/go.mod +++ b/service/mediaconnect/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediaconnect/go.sum b/service/mediaconnect/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/mediaconnect/go.sum +++ b/service/mediaconnect/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mediaconnect/serializers.go b/service/mediaconnect/serializers.go index e713501c753..83286587b40 100644 --- a/service/mediaconnect/serializers.go +++ b/service/mediaconnect/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAddFlowOutputs) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/flows/{FlowArn}/outputs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -124,13 +119,8 @@ func (m *awsRestjson1_serializeOpAddFlowSources) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/flows/{FlowArn}/source") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -212,13 +202,8 @@ func (m *awsRestjson1_serializeOpAddFlowVpcInterfaces) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v1/flows/{FlowArn}/vpcInterfaces") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -300,13 +285,8 @@ func (m *awsRestjson1_serializeOpCreateFlow) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/flows") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -420,13 +400,8 @@ func (m *awsRestjson1_serializeOpDeleteFlow) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/flows/{FlowArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -483,13 +458,8 @@ func (m *awsRestjson1_serializeOpDescribeFlow) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/flows/{FlowArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -546,13 +516,8 @@ func (m *awsRestjson1_serializeOpDescribeOffering) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/offerings/{OfferingArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -609,13 +574,8 @@ func (m *awsRestjson1_serializeOpDescribeReservation) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/reservations/{ReservationArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -672,13 +632,8 @@ func (m *awsRestjson1_serializeOpGrantFlowEntitlements) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/flows/{FlowArn}/entitlements") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -760,13 +715,8 @@ func (m *awsRestjson1_serializeOpListEntitlements) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/entitlements") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -822,13 +772,8 @@ func (m *awsRestjson1_serializeOpListFlows) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/flows") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -884,13 +829,8 @@ func (m *awsRestjson1_serializeOpListOfferings) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/offerings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -946,13 +886,8 @@ func (m *awsRestjson1_serializeOpListReservations) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/reservations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1008,13 +943,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1071,13 +1001,8 @@ func (m *awsRestjson1_serializeOpPurchaseOffering) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/offerings/{OfferingArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1162,13 +1087,8 @@ func (m *awsRestjson1_serializeOpRemoveFlowOutput) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/flows/{FlowArn}/outputs/{OutputArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1234,13 +1154,8 @@ func (m *awsRestjson1_serializeOpRemoveFlowSource) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/flows/{FlowArn}/source/{SourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1306,13 +1221,8 @@ func (m *awsRestjson1_serializeOpRemoveFlowVpcInterface) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v1/flows/{FlowArn}/vpcInterfaces/{VpcInterfaceName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1378,13 +1288,8 @@ func (m *awsRestjson1_serializeOpRevokeFlowEntitlement) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/flows/{FlowArn}/entitlements/{EntitlementArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1450,13 +1355,8 @@ func (m *awsRestjson1_serializeOpStartFlow) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/flows/start/{FlowArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1513,13 +1413,8 @@ func (m *awsRestjson1_serializeOpStopFlow) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/flows/stop/{FlowArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1576,13 +1471,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1664,13 +1554,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1733,13 +1618,8 @@ func (m *awsRestjson1_serializeOpUpdateFlow) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/flows/{FlowArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1821,13 +1701,8 @@ func (m *awsRestjson1_serializeOpUpdateFlowEntitlement) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/flows/{FlowArn}/entitlements/{EntitlementArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1935,13 +1810,8 @@ func (m *awsRestjson1_serializeOpUpdateFlowOutput) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/flows/{FlowArn}/outputs/{OutputArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2091,13 +1961,8 @@ func (m *awsRestjson1_serializeOpUpdateFlowSource) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/flows/{FlowArn}/source/{SourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/mediaconvert/go.mod b/service/mediaconvert/go.mod index e1331f22914..e4ca0d4998b 100644 --- a/service/mediaconvert/go.mod +++ b/service/mediaconvert/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediaconvert/go.sum b/service/mediaconvert/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/mediaconvert/go.sum +++ b/service/mediaconvert/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mediaconvert/serializers.go b/service/mediaconvert/serializers.go index fdad8b325b6..f40695f67b8 100644 --- a/service/mediaconvert/serializers.go +++ b/service/mediaconvert/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAssociateCertificate) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/certificates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -109,13 +104,8 @@ func (m *awsRestjson1_serializeOpCancelJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/jobs/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -172,13 +162,8 @@ func (m *awsRestjson1_serializeOpCreateJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -315,13 +300,8 @@ func (m *awsRestjson1_serializeOpCreateJobTemplate) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/jobTemplates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -441,13 +421,8 @@ func (m *awsRestjson1_serializeOpCreatePreset) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/presets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -538,13 +513,8 @@ func (m *awsRestjson1_serializeOpCreateQueue) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/queues") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -640,13 +610,8 @@ func (m *awsRestjson1_serializeOpDeleteJobTemplate) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/jobTemplates/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -703,13 +668,8 @@ func (m *awsRestjson1_serializeOpDeletePreset) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/presets/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -766,13 +726,8 @@ func (m *awsRestjson1_serializeOpDeleteQueue) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/queues/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -829,13 +784,8 @@ func (m *awsRestjson1_serializeOpDescribeEndpoints) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/endpoints") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -912,13 +862,8 @@ func (m *awsRestjson1_serializeOpDisassociateCertificate) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/certificates/{Arn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -975,13 +920,8 @@ func (m *awsRestjson1_serializeOpGetJob) HandleSerialize(ctx context.Context, in } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/jobs/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1038,13 +978,8 @@ func (m *awsRestjson1_serializeOpGetJobTemplate) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/jobTemplates/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1101,13 +1036,8 @@ func (m *awsRestjson1_serializeOpGetPreset) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/presets/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1164,13 +1094,8 @@ func (m *awsRestjson1_serializeOpGetQueue) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/queues/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1227,13 +1152,8 @@ func (m *awsRestjson1_serializeOpListJobs) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1301,13 +1221,8 @@ func (m *awsRestjson1_serializeOpListJobTemplates) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/jobTemplates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1375,13 +1290,8 @@ func (m *awsRestjson1_serializeOpListPresets) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/presets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1449,13 +1359,8 @@ func (m *awsRestjson1_serializeOpListQueues) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/queues") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1519,13 +1424,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/tags/{Arn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1582,13 +1482,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1662,13 +1557,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/tags/{Arn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1750,13 +1640,8 @@ func (m *awsRestjson1_serializeOpUpdateJobTemplate) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/jobTemplates/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1877,13 +1762,8 @@ func (m *awsRestjson1_serializeOpUpdatePreset) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/presets/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1975,13 +1855,8 @@ func (m *awsRestjson1_serializeOpUpdateQueue) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2017-08-29/queues/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/medialive/go.mod b/service/medialive/go.mod index 46716869f4d..83762616c81 100644 --- a/service/medialive/go.mod +++ b/service/medialive/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/medialive/go.sum b/service/medialive/go.sum index d937214c3eb..9ddcad9aa66 100644 --- a/service/medialive/go.sum +++ b/service/medialive/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= 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.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= diff --git a/service/medialive/serializers.go b/service/medialive/serializers.go index a265e8641ff..89bc4ede9b8 100644 --- a/service/medialive/serializers.go +++ b/service/medialive/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAcceptInputDeviceTransfer) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/prod/inputDevices/{InputDeviceId}/accept") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -99,13 +94,8 @@ func (m *awsRestjson1_serializeOpBatchDelete) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/prod/batch/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -195,13 +185,8 @@ func (m *awsRestjson1_serializeOpBatchStart) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/prod/batch/start") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -277,13 +262,8 @@ func (m *awsRestjson1_serializeOpBatchStop) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/prod/batch/stop") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -359,13 +339,8 @@ func (m *awsRestjson1_serializeOpBatchUpdateSchedule) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/prod/channels/{ChannelId}/schedule") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -454,13 +429,8 @@ func (m *awsRestjson1_serializeOpCancelInputDeviceTransfer) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/prod/inputDevices/{InputDeviceId}/cancel") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -517,13 +487,8 @@ func (m *awsRestjson1_serializeOpCreateChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/prod/channels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -664,13 +629,8 @@ func (m *awsRestjson1_serializeOpCreateInput) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/prod/inputs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -801,13 +761,8 @@ func (m *awsRestjson1_serializeOpCreateInputSecurityGroup) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/prod/inputSecurityGroups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -883,13 +838,8 @@ func (m *awsRestjson1_serializeOpCreateMultiplex) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/prod/multiplexes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -982,13 +932,8 @@ func (m *awsRestjson1_serializeOpCreateMultiplexProgram) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/prod/multiplexes/{MultiplexId}/programs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1080,13 +1025,8 @@ func (m *awsRestjson1_serializeOpCreatePartnerInput) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/prod/inputs/{InputId}/partners") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1173,13 +1113,8 @@ func (m *awsRestjson1_serializeOpCreateTags) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/prod/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1261,13 +1196,8 @@ func (m *awsRestjson1_serializeOpDeleteChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/prod/channels/{ChannelId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1324,13 +1254,8 @@ func (m *awsRestjson1_serializeOpDeleteInput) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/prod/inputs/{InputId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1387,13 +1312,8 @@ func (m *awsRestjson1_serializeOpDeleteInputSecurityGroup) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/prod/inputSecurityGroups/{InputSecurityGroupId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1450,13 +1370,8 @@ func (m *awsRestjson1_serializeOpDeleteMultiplex) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/prod/multiplexes/{MultiplexId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1513,13 +1428,8 @@ func (m *awsRestjson1_serializeOpDeleteMultiplexProgram) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/prod/multiplexes/{MultiplexId}/programs/{ProgramName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1585,13 +1495,8 @@ func (m *awsRestjson1_serializeOpDeleteReservation) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/prod/reservations/{ReservationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1648,13 +1553,8 @@ func (m *awsRestjson1_serializeOpDeleteSchedule) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/prod/channels/{ChannelId}/schedule") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1711,13 +1611,8 @@ func (m *awsRestjson1_serializeOpDeleteTags) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/prod/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1780,13 +1675,8 @@ func (m *awsRestjson1_serializeOpDescribeChannel) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/prod/channels/{ChannelId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1843,13 +1733,8 @@ func (m *awsRestjson1_serializeOpDescribeInput) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/prod/inputs/{InputId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1906,13 +1791,8 @@ func (m *awsRestjson1_serializeOpDescribeInputDevice) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/prod/inputDevices/{InputDeviceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1969,13 +1849,8 @@ func (m *awsRestjson1_serializeOpDescribeInputDeviceThumbnail) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/prod/inputDevices/{InputDeviceId}/thumbnailData") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2037,13 +1912,8 @@ func (m *awsRestjson1_serializeOpDescribeInputSecurityGroup) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/prod/inputSecurityGroups/{InputSecurityGroupId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2100,13 +1970,8 @@ func (m *awsRestjson1_serializeOpDescribeMultiplex) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/prod/multiplexes/{MultiplexId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2163,13 +2028,8 @@ func (m *awsRestjson1_serializeOpDescribeMultiplexProgram) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/prod/multiplexes/{MultiplexId}/programs/{ProgramName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2235,13 +2095,8 @@ func (m *awsRestjson1_serializeOpDescribeOffering) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/prod/offerings/{OfferingId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2298,13 +2153,8 @@ func (m *awsRestjson1_serializeOpDescribeReservation) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/prod/reservations/{ReservationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2361,13 +2211,8 @@ func (m *awsRestjson1_serializeOpDescribeSchedule) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/prod/channels/{ChannelId}/schedule") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2432,13 +2277,8 @@ func (m *awsRestjson1_serializeOpListChannels) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/prod/channels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2494,13 +2334,8 @@ func (m *awsRestjson1_serializeOpListInputDevices) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/prod/inputDevices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2556,13 +2391,8 @@ func (m *awsRestjson1_serializeOpListInputDeviceTransfers) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/prod/inputDeviceTransfers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2622,13 +2452,8 @@ func (m *awsRestjson1_serializeOpListInputs) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/prod/inputs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2684,13 +2509,8 @@ func (m *awsRestjson1_serializeOpListInputSecurityGroups) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/prod/inputSecurityGroups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2746,13 +2566,8 @@ func (m *awsRestjson1_serializeOpListMultiplexes) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/prod/multiplexes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2808,13 +2623,8 @@ func (m *awsRestjson1_serializeOpListMultiplexPrograms) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/prod/multiplexes/{MultiplexId}/programs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2879,13 +2689,8 @@ func (m *awsRestjson1_serializeOpListOfferings) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/prod/offerings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2981,13 +2786,8 @@ func (m *awsRestjson1_serializeOpListReservations) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/prod/reservations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3075,13 +2875,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/prod/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3138,13 +2933,8 @@ func (m *awsRestjson1_serializeOpPurchaseOffering) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/prod/offerings/{OfferingId}/purchase") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3246,13 +3036,8 @@ func (m *awsRestjson1_serializeOpRejectInputDeviceTransfer) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/prod/inputDevices/{InputDeviceId}/reject") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3309,13 +3094,8 @@ func (m *awsRestjson1_serializeOpStartChannel) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/prod/channels/{ChannelId}/start") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3372,13 +3152,8 @@ func (m *awsRestjson1_serializeOpStartMultiplex) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/prod/multiplexes/{MultiplexId}/start") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3435,13 +3210,8 @@ func (m *awsRestjson1_serializeOpStopChannel) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/prod/channels/{ChannelId}/stop") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3498,13 +3268,8 @@ func (m *awsRestjson1_serializeOpStopMultiplex) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/prod/multiplexes/{MultiplexId}/stop") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3561,13 +3326,8 @@ func (m *awsRestjson1_serializeOpTransferInputDevice) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/prod/inputDevices/{InputDeviceId}/transfer") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3657,13 +3417,8 @@ func (m *awsRestjson1_serializeOpUpdateChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/prod/channels/{ChannelId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3788,13 +3543,8 @@ func (m *awsRestjson1_serializeOpUpdateChannelClass) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/prod/channels/{ChannelId}/channelClass") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3881,13 +3631,8 @@ func (m *awsRestjson1_serializeOpUpdateInput) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/prod/inputs/{InputId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4007,13 +3752,8 @@ func (m *awsRestjson1_serializeOpUpdateInputDevice) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/prod/inputDevices/{InputDeviceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4107,13 +3847,8 @@ func (m *awsRestjson1_serializeOpUpdateInputSecurityGroup) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/prod/inputSecurityGroups/{InputSecurityGroupId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4202,13 +3937,8 @@ func (m *awsRestjson1_serializeOpUpdateMultiplex) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/prod/multiplexes/{MultiplexId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4295,13 +4025,8 @@ func (m *awsRestjson1_serializeOpUpdateMultiplexProgram) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/prod/multiplexes/{MultiplexId}/programs/{ProgramName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4392,13 +4117,8 @@ func (m *awsRestjson1_serializeOpUpdateReservation) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/prod/reservations/{ReservationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/mediapackage/go.mod b/service/mediapackage/go.mod index dc2228b8953..3349f35e673 100644 --- a/service/mediapackage/go.mod +++ b/service/mediapackage/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediapackage/go.sum b/service/mediapackage/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/mediapackage/go.sum +++ b/service/mediapackage/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mediapackage/serializers.go b/service/mediapackage/serializers.go index 0e9dd872738..912bc71b792 100644 --- a/service/mediapackage/serializers.go +++ b/service/mediapackage/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpConfigureLogs) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/channels/{Id}/configure_logs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -131,13 +126,8 @@ func (m *awsRestjson1_serializeOpCreateChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/channels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -216,13 +206,8 @@ func (m *awsRestjson1_serializeOpCreateHarvestJob) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/harvest_jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -311,13 +296,8 @@ func (m *awsRestjson1_serializeOpCreateOriginEndpoint) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/origin_endpoints") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -463,13 +443,8 @@ func (m *awsRestjson1_serializeOpDeleteChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/channels/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -526,13 +501,8 @@ func (m *awsRestjson1_serializeOpDeleteOriginEndpoint) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/origin_endpoints/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -589,13 +559,8 @@ func (m *awsRestjson1_serializeOpDescribeChannel) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/channels/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -652,13 +617,8 @@ func (m *awsRestjson1_serializeOpDescribeHarvestJob) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/harvest_jobs/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -715,13 +675,8 @@ func (m *awsRestjson1_serializeOpDescribeOriginEndpoint) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/origin_endpoints/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -778,13 +733,8 @@ func (m *awsRestjson1_serializeOpListChannels) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/channels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -840,13 +790,8 @@ func (m *awsRestjson1_serializeOpListHarvestJobs) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/harvest_jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -910,13 +855,8 @@ func (m *awsRestjson1_serializeOpListOriginEndpoints) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/origin_endpoints") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -976,13 +916,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1039,13 +974,8 @@ func (m *awsRestjson1_serializeOpRotateChannelCredentials) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/channels/{Id}/credentials") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1102,13 +1032,8 @@ func (m *awsRestjson1_serializeOpRotateIngestEndpointCredentials) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/channels/{Id}/ingest_endpoints/{IngestEndpointId}/credentials") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1174,13 +1099,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1262,13 +1182,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1331,13 +1246,8 @@ func (m *awsRestjson1_serializeOpUpdateChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/channels/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1417,13 +1327,8 @@ func (m *awsRestjson1_serializeOpUpdateOriginEndpoint) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/origin_endpoints/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/mediapackagevod/go.mod b/service/mediapackagevod/go.mod index cd45dd4920d..50e430652d1 100644 --- a/service/mediapackagevod/go.mod +++ b/service/mediapackagevod/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediapackagevod/go.sum b/service/mediapackagevod/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/mediapackagevod/go.sum +++ b/service/mediapackagevod/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mediapackagevod/serializers.go b/service/mediapackagevod/serializers.go index e3dc30e5c7f..d2dcb43c1bc 100644 --- a/service/mediapackagevod/serializers.go +++ b/service/mediapackagevod/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpConfigureLogs) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/packaging_groups/{Id}/configure_logs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -124,13 +119,8 @@ func (m *awsRestjson1_serializeOpCreateAsset) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/assets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -224,13 +214,8 @@ func (m *awsRestjson1_serializeOpCreatePackagingConfiguration) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/packaging_configurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -337,13 +322,8 @@ func (m *awsRestjson1_serializeOpCreatePackagingGroup) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/packaging_groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -431,13 +411,8 @@ func (m *awsRestjson1_serializeOpDeleteAsset) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/assets/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -494,13 +469,8 @@ func (m *awsRestjson1_serializeOpDeletePackagingConfiguration) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/packaging_configurations/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -557,13 +527,8 @@ func (m *awsRestjson1_serializeOpDeletePackagingGroup) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/packaging_groups/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -620,13 +585,8 @@ func (m *awsRestjson1_serializeOpDescribeAsset) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/assets/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -683,13 +643,8 @@ func (m *awsRestjson1_serializeOpDescribePackagingConfiguration) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/packaging_configurations/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -746,13 +701,8 @@ func (m *awsRestjson1_serializeOpDescribePackagingGroup) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/packaging_groups/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -809,13 +759,8 @@ func (m *awsRestjson1_serializeOpListAssets) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/assets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -875,13 +820,8 @@ func (m *awsRestjson1_serializeOpListPackagingConfigurations) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/packaging_configurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -941,13 +881,8 @@ func (m *awsRestjson1_serializeOpListPackagingGroups) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/packaging_groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1003,13 +938,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1066,13 +996,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1154,13 +1079,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1223,13 +1143,8 @@ func (m *awsRestjson1_serializeOpUpdatePackagingGroup) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/packaging_groups/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/mediastoredata/go.mod b/service/mediastoredata/go.mod index 595962917ca..c42466dd89a 100644 --- a/service/mediastoredata/go.mod +++ b/service/mediastoredata/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediastoredata/go.sum b/service/mediastoredata/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/mediastoredata/go.sum +++ b/service/mediastoredata/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mediastoredata/serializers.go b/service/mediastoredata/serializers.go index 2a14f7d394d..8c1bddf742b 100644 --- a/service/mediastoredata/serializers.go +++ b/service/mediastoredata/serializers.go @@ -33,13 +33,8 @@ func (m *awsRestjson1_serializeOpDeleteObject) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/{Path+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -96,13 +91,8 @@ func (m *awsRestjson1_serializeOpDescribeObject) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/{Path+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "HEAD" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -159,13 +149,8 @@ func (m *awsRestjson1_serializeOpGetObject) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/{Path+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -227,13 +212,8 @@ func (m *awsRestjson1_serializeOpListItems) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -293,13 +273,8 @@ func (m *awsRestjson1_serializeOpPutObject) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/{Path+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/mediatailor/go.mod b/service/mediatailor/go.mod index 01f92008f7b..d0bd7e967c7 100644 --- a/service/mediatailor/go.mod +++ b/service/mediatailor/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mediatailor/go.sum b/service/mediatailor/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/mediatailor/go.sum +++ b/service/mediatailor/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mediatailor/serializers.go b/service/mediatailor/serializers.go index fb573bb86c9..3e5f6fd53bb 100644 --- a/service/mediatailor/serializers.go +++ b/service/mediatailor/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/channel/{ChannelName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -136,13 +131,8 @@ func (m *awsRestjson1_serializeOpCreateProgram) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/channel/{ChannelName}/program/{ProgramName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -250,13 +240,8 @@ func (m *awsRestjson1_serializeOpCreateSourceLocation) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/sourceLocation/{SourceLocationName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -359,13 +344,8 @@ func (m *awsRestjson1_serializeOpCreateVodSource) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/sourceLocation/{SourceLocationName}/vodSource/{VodSourceName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -463,13 +443,8 @@ func (m *awsRestjson1_serializeOpDeleteChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/channel/{ChannelName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -526,13 +501,8 @@ func (m *awsRestjson1_serializeOpDeleteChannelPolicy) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/channel/{ChannelName}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -589,13 +559,8 @@ func (m *awsRestjson1_serializeOpDeletePlaybackConfiguration) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/playbackConfiguration/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -652,13 +617,8 @@ func (m *awsRestjson1_serializeOpDeleteProgram) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/channel/{ChannelName}/program/{ProgramName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -724,13 +684,8 @@ func (m *awsRestjson1_serializeOpDeleteSourceLocation) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/sourceLocation/{SourceLocationName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -787,13 +742,8 @@ func (m *awsRestjson1_serializeOpDeleteVodSource) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/sourceLocation/{SourceLocationName}/vodSource/{VodSourceName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -859,13 +809,8 @@ func (m *awsRestjson1_serializeOpDescribeChannel) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/channel/{ChannelName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -922,13 +867,8 @@ func (m *awsRestjson1_serializeOpDescribeProgram) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/channel/{ChannelName}/program/{ProgramName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -994,13 +934,8 @@ func (m *awsRestjson1_serializeOpDescribeSourceLocation) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/sourceLocation/{SourceLocationName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1057,13 +992,8 @@ func (m *awsRestjson1_serializeOpDescribeVodSource) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/sourceLocation/{SourceLocationName}/vodSource/{VodSourceName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1129,13 +1059,8 @@ func (m *awsRestjson1_serializeOpGetChannelPolicy) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/channel/{ChannelName}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1192,13 +1117,8 @@ func (m *awsRestjson1_serializeOpGetChannelSchedule) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/channel/{ChannelName}/schedule") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1267,13 +1187,8 @@ func (m *awsRestjson1_serializeOpGetPlaybackConfiguration) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/playbackConfiguration/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1330,13 +1245,8 @@ func (m *awsRestjson1_serializeOpListChannels) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/channels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1392,13 +1302,8 @@ func (m *awsRestjson1_serializeOpListPlaybackConfigurations) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/playbackConfigurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1454,13 +1359,8 @@ func (m *awsRestjson1_serializeOpListSourceLocations) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/sourceLocations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1516,13 +1416,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1579,13 +1474,8 @@ func (m *awsRestjson1_serializeOpListVodSources) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/sourceLocation/{SourceLocationName}/vodSources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1650,13 +1540,8 @@ func (m *awsRestjson1_serializeOpPutChannelPolicy) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/channel/{ChannelName}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1736,13 +1621,8 @@ func (m *awsRestjson1_serializeOpPutPlaybackConfiguration) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/playbackConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1890,13 +1770,8 @@ func (m *awsRestjson1_serializeOpStartChannel) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/channel/{ChannelName}/start") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1953,13 +1828,8 @@ func (m *awsRestjson1_serializeOpStopChannel) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/channel/{ChannelName}/stop") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2016,13 +1886,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2104,13 +1969,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2173,13 +2033,8 @@ func (m *awsRestjson1_serializeOpUpdateChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/channel/{ChannelName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2261,13 +2116,8 @@ func (m *awsRestjson1_serializeOpUpdateSourceLocation) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/sourceLocation/{SourceLocationName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2363,13 +2213,8 @@ func (m *awsRestjson1_serializeOpUpdateVodSource) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/sourceLocation/{SourceLocationName}/vodSource/{VodSourceName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/mobile/go.mod b/service/mobile/go.mod index cb901fe7bf5..05bf78178cf 100644 --- a/service/mobile/go.mod +++ b/service/mobile/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mobile/go.sum b/service/mobile/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/mobile/go.sum +++ b/service/mobile/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mobile/serializers.go b/service/mobile/serializers.go index da86de04ba4..00392d02e2c 100644 --- a/service/mobile/serializers.go +++ b/service/mobile/serializers.go @@ -34,13 +34,8 @@ func (m *awsRestjson1_serializeOpCreateProject) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/projects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -111,13 +106,8 @@ func (m *awsRestjson1_serializeOpDeleteProject) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/projects/{projectId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -174,13 +164,8 @@ func (m *awsRestjson1_serializeOpDescribeBundle) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/bundles/{bundleId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -237,13 +222,8 @@ func (m *awsRestjson1_serializeOpDescribeProject) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/project") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -299,13 +279,8 @@ func (m *awsRestjson1_serializeOpExportBundle) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/bundles/{bundleId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -370,13 +345,8 @@ func (m *awsRestjson1_serializeOpExportProject) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/exports/{projectId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -433,13 +403,8 @@ func (m *awsRestjson1_serializeOpListBundles) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/bundles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -495,13 +460,8 @@ func (m *awsRestjson1_serializeOpListProjects) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/projects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -557,13 +517,8 @@ func (m *awsRestjson1_serializeOpUpdateProject) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/update") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/mq/go.mod b/service/mq/go.mod index a0d8c358d5c..597ab2751d4 100644 --- a/service/mq/go.mod +++ b/service/mq/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mq/go.sum b/service/mq/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/mq/go.sum +++ b/service/mq/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mq/serializers.go b/service/mq/serializers.go index e3eecf201cc..6f7e5aa3e0e 100644 --- a/service/mq/serializers.go +++ b/service/mq/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateBroker) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/brokers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -217,13 +212,8 @@ func (m *awsRestjson1_serializeOpCreateConfiguration) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/configurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -312,13 +302,8 @@ func (m *awsRestjson1_serializeOpCreateTags) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -400,13 +385,8 @@ func (m *awsRestjson1_serializeOpCreateUser) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/brokers/{BrokerId}/users/{Username}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -507,13 +487,8 @@ func (m *awsRestjson1_serializeOpDeleteBroker) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/brokers/{BrokerId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -570,13 +545,8 @@ func (m *awsRestjson1_serializeOpDeleteTags) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -639,13 +609,8 @@ func (m *awsRestjson1_serializeOpDeleteUser) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/brokers/{BrokerId}/users/{Username}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -711,13 +676,8 @@ func (m *awsRestjson1_serializeOpDescribeBroker) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/brokers/{BrokerId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -774,13 +734,8 @@ func (m *awsRestjson1_serializeOpDescribeBrokerEngineTypes) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v1/broker-engine-types") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -840,13 +795,8 @@ func (m *awsRestjson1_serializeOpDescribeBrokerInstanceOptions) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/v1/broker-instance-options") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -914,13 +864,8 @@ func (m *awsRestjson1_serializeOpDescribeConfiguration) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/configurations/{ConfigurationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -977,13 +922,8 @@ func (m *awsRestjson1_serializeOpDescribeConfigurationRevision) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/v1/configurations/{ConfigurationId}/revisions/{ConfigurationRevision}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1049,13 +989,8 @@ func (m *awsRestjson1_serializeOpDescribeUser) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/brokers/{BrokerId}/users/{Username}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1121,13 +1056,8 @@ func (m *awsRestjson1_serializeOpListBrokers) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/brokers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1183,13 +1113,8 @@ func (m *awsRestjson1_serializeOpListConfigurationRevisions) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v1/configurations/{ConfigurationId}/revisions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1254,13 +1179,8 @@ func (m *awsRestjson1_serializeOpListConfigurations) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/configurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1316,13 +1236,8 @@ func (m *awsRestjson1_serializeOpListTags) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1379,13 +1294,8 @@ func (m *awsRestjson1_serializeOpListUsers) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/brokers/{BrokerId}/users") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1450,13 +1360,8 @@ func (m *awsRestjson1_serializeOpRebootBroker) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/brokers/{BrokerId}/reboot") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1513,13 +1418,8 @@ func (m *awsRestjson1_serializeOpUpdateBroker) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/brokers/{BrokerId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1642,13 +1542,8 @@ func (m *awsRestjson1_serializeOpUpdateConfiguration) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/configurations/{ConfigurationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1733,13 +1628,8 @@ func (m *awsRestjson1_serializeOpUpdateUser) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/brokers/{BrokerId}/users/{Username}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/mwaa/go.mod b/service/mwaa/go.mod index 40d295b1ca5..ef56c2a8657 100644 --- a/service/mwaa/go.mod +++ b/service/mwaa/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/mwaa/go.sum b/service/mwaa/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/mwaa/go.sum +++ b/service/mwaa/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/mwaa/serializers.go b/service/mwaa/serializers.go index ebbfd782cdb..5b1c8982d01 100644 --- a/service/mwaa/serializers.go +++ b/service/mwaa/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpCreateCliToken) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/clitoken/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -100,13 +95,8 @@ func (m *awsRestjson1_serializeOpCreateEnvironment) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/environments/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -279,13 +269,8 @@ func (m *awsRestjson1_serializeOpCreateWebLoginToken) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/webtoken/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -342,13 +327,8 @@ func (m *awsRestjson1_serializeOpDeleteEnvironment) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/environments/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -405,13 +385,8 @@ func (m *awsRestjson1_serializeOpGetEnvironment) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/environments/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -468,13 +443,8 @@ func (m *awsRestjson1_serializeOpListEnvironments) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/environments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -530,13 +500,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -593,13 +558,8 @@ func (m *awsRestjson1_serializeOpPublishMetrics) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/metrics/environments/{EnvironmentName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -681,13 +641,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -769,13 +724,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -838,13 +788,8 @@ func (m *awsRestjson1_serializeOpUpdateEnvironment) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/environments/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/networkmanager/go.mod b/service/networkmanager/go.mod index 156c99826da..94dc1179421 100644 --- a/service/networkmanager/go.mod +++ b/service/networkmanager/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/networkmanager/go.sum b/service/networkmanager/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/networkmanager/go.sum +++ b/service/networkmanager/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/networkmanager/serializers.go b/service/networkmanager/serializers.go index 0c9b76f0599..9f1e274c35a 100644 --- a/service/networkmanager/serializers.go +++ b/service/networkmanager/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAssociateCustomerGateway) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/customer-gateway-associations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -132,13 +127,8 @@ func (m *awsRestjson1_serializeOpAssociateLink) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/link-associations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -223,13 +213,8 @@ func (m *awsRestjson1_serializeOpAssociateTransitGatewayConnectPeer) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/transit-gateway-connect-peer-associations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -319,13 +304,8 @@ func (m *awsRestjson1_serializeOpCreateConnection) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/connections") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -432,13 +412,8 @@ func (m *awsRestjson1_serializeOpCreateDevice) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/devices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -564,13 +539,8 @@ func (m *awsRestjson1_serializeOpCreateGlobalNetwork) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/global-networks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -644,13 +614,8 @@ func (m *awsRestjson1_serializeOpCreateLink) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/links") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -759,13 +724,8 @@ func (m *awsRestjson1_serializeOpCreateSite) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/sites") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -859,13 +819,8 @@ func (m *awsRestjson1_serializeOpDeleteConnection) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/connections/{ConnectionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -931,13 +886,8 @@ func (m *awsRestjson1_serializeOpDeleteDevice) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/devices/{DeviceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1003,13 +953,8 @@ func (m *awsRestjson1_serializeOpDeleteGlobalNetwork) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1066,13 +1011,8 @@ func (m *awsRestjson1_serializeOpDeleteLink) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/links/{LinkId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1138,13 +1078,8 @@ func (m *awsRestjson1_serializeOpDeleteSite) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/sites/{SiteId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1210,13 +1145,8 @@ func (m *awsRestjson1_serializeOpDeregisterTransitGateway) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/transit-gateway-registrations/{TransitGatewayArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1282,13 +1212,8 @@ func (m *awsRestjson1_serializeOpDescribeGlobalNetworks) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/global-networks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1350,13 +1275,8 @@ func (m *awsRestjson1_serializeOpDisassociateCustomerGateway) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/customer-gateway-associations/{CustomerGatewayArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1422,13 +1342,8 @@ func (m *awsRestjson1_serializeOpDisassociateLink) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/link-associations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1493,13 +1408,8 @@ func (m *awsRestjson1_serializeOpDisassociateTransitGatewayConnectPeer) HandleSe } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/transit-gateway-connect-peer-associations/{TransitGatewayConnectPeerArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1565,13 +1475,8 @@ func (m *awsRestjson1_serializeOpGetConnections) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/connections") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1646,13 +1551,8 @@ func (m *awsRestjson1_serializeOpGetCustomerGatewayAssociations) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/customer-gateway-associations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1723,13 +1623,8 @@ func (m *awsRestjson1_serializeOpGetDevices) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/devices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1804,13 +1699,8 @@ func (m *awsRestjson1_serializeOpGetLinkAssociations) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/link-associations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1883,13 +1773,8 @@ func (m *awsRestjson1_serializeOpGetLinks) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/links") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1972,13 +1857,8 @@ func (m *awsRestjson1_serializeOpGetSites) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/sites") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2049,13 +1929,8 @@ func (m *awsRestjson1_serializeOpGetTransitGatewayConnectPeerAssociations) Handl } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/transit-gateway-connect-peer-associations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2126,13 +2001,8 @@ func (m *awsRestjson1_serializeOpGetTransitGatewayRegistrations) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/transit-gateway-registrations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2203,13 +2073,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2266,13 +2131,8 @@ func (m *awsRestjson1_serializeOpRegisterTransitGateway) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/transit-gateway-registrations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2352,13 +2212,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2440,13 +2295,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2509,13 +2359,8 @@ func (m *awsRestjson1_serializeOpUpdateConnection) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/connections/{ConnectionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2614,13 +2459,8 @@ func (m *awsRestjson1_serializeOpUpdateDevice) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/devices/{DeviceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2748,13 +2588,8 @@ func (m *awsRestjson1_serializeOpUpdateGlobalNetwork) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2834,13 +2669,8 @@ func (m *awsRestjson1_serializeOpUpdateLink) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/links/{LinkId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2946,13 +2776,8 @@ func (m *awsRestjson1_serializeOpUpdateSite) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/global-networks/{GlobalNetworkId}/sites/{SiteId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/outposts/go.mod b/service/outposts/go.mod index 005cfb227e3..de59b2cdcdb 100644 --- a/service/outposts/go.mod +++ b/service/outposts/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/outposts/go.sum b/service/outposts/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/outposts/go.sum +++ b/service/outposts/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/outposts/serializers.go b/service/outposts/serializers.go index a1424de73e1..cbe43343c5d 100644 --- a/service/outposts/serializers.go +++ b/service/outposts/serializers.go @@ -35,13 +35,8 @@ func (m *awsRestjson1_serializeOpCreateOutpost) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/outposts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -135,13 +130,8 @@ func (m *awsRestjson1_serializeOpDeleteOutpost) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/outposts/{OutpostId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -198,13 +188,8 @@ func (m *awsRestjson1_serializeOpDeleteSite) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/sites/{SiteId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -261,13 +246,8 @@ func (m *awsRestjson1_serializeOpGetOutpost) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/outposts/{OutpostId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -324,13 +304,8 @@ func (m *awsRestjson1_serializeOpGetOutpostInstanceTypes) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/outposts/{OutpostId}/instanceTypes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -395,13 +370,8 @@ func (m *awsRestjson1_serializeOpListOutposts) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/outposts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -457,13 +427,8 @@ func (m *awsRestjson1_serializeOpListSites) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/sites") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -519,13 +484,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -582,13 +542,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -670,13 +625,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/personalizeevents/go.mod b/service/personalizeevents/go.mod index 6f2d02d9d48..ba4ca5a86bc 100644 --- a/service/personalizeevents/go.mod +++ b/service/personalizeevents/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/personalizeevents/go.sum b/service/personalizeevents/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/personalizeevents/go.sum +++ b/service/personalizeevents/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/personalizeevents/serializers.go b/service/personalizeevents/serializers.go index cb66f797c4e..0121d0a66f3 100644 --- a/service/personalizeevents/serializers.go +++ b/service/personalizeevents/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpPutEvents) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/events") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -127,13 +122,8 @@ func (m *awsRestjson1_serializeOpPutItems) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/items") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -207,13 +197,8 @@ func (m *awsRestjson1_serializeOpPutUsers) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/users") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/personalizeruntime/go.mod b/service/personalizeruntime/go.mod index 9b2ce39e8bc..51383b7f196 100644 --- a/service/personalizeruntime/go.mod +++ b/service/personalizeruntime/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/personalizeruntime/go.sum b/service/personalizeruntime/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/personalizeruntime/go.sum +++ b/service/personalizeruntime/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/personalizeruntime/serializers.go b/service/personalizeruntime/serializers.go index ba6fe63ec32..3508cd8f873 100644 --- a/service/personalizeruntime/serializers.go +++ b/service/personalizeruntime/serializers.go @@ -35,13 +35,8 @@ func (m *awsRestjson1_serializeOpGetPersonalizedRanking) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/personalize-ranking") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -139,13 +134,8 @@ func (m *awsRestjson1_serializeOpGetRecommendations) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/recommendations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/pinpoint/go.mod b/service/pinpoint/go.mod index f1d3502ce99..c7737a8e199 100644 --- a/service/pinpoint/go.mod +++ b/service/pinpoint/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pinpoint/go.sum b/service/pinpoint/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/pinpoint/go.sum +++ b/service/pinpoint/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/pinpoint/serializers.go b/service/pinpoint/serializers.go index 54ec8cc8c49..04eb64c9b92 100644 --- a/service/pinpoint/serializers.go +++ b/service/pinpoint/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpCreateApp) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/apps") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -102,13 +97,8 @@ func (m *awsRestjson1_serializeOpCreateCampaign) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/campaigns") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -180,13 +170,8 @@ func (m *awsRestjson1_serializeOpCreateEmailTemplate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/email") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -258,13 +243,8 @@ func (m *awsRestjson1_serializeOpCreateExportJob) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/jobs/export") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -336,13 +316,8 @@ func (m *awsRestjson1_serializeOpCreateImportJob) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/jobs/import") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -414,13 +389,8 @@ func (m *awsRestjson1_serializeOpCreateJourney) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/journeys") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -492,13 +462,8 @@ func (m *awsRestjson1_serializeOpCreatePushTemplate) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/push") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -570,13 +535,8 @@ func (m *awsRestjson1_serializeOpCreateRecommenderConfiguration) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/v1/recommenders") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -635,13 +595,8 @@ func (m *awsRestjson1_serializeOpCreateSegment) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/segments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -713,13 +668,8 @@ func (m *awsRestjson1_serializeOpCreateSmsTemplate) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/sms") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -791,13 +741,8 @@ func (m *awsRestjson1_serializeOpCreateVoiceTemplate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/voice") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -869,13 +814,8 @@ func (m *awsRestjson1_serializeOpDeleteAdmChannel) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/adm") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -932,13 +872,8 @@ func (m *awsRestjson1_serializeOpDeleteApnsChannel) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/apns") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -995,13 +930,8 @@ func (m *awsRestjson1_serializeOpDeleteApnsSandboxChannel) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/apns_sandbox") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1058,13 +988,8 @@ func (m *awsRestjson1_serializeOpDeleteApnsVoipChannel) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/apns_voip") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1121,13 +1046,8 @@ func (m *awsRestjson1_serializeOpDeleteApnsVoipSandboxChannel) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/apns_voip_sandbox") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1184,13 +1104,8 @@ func (m *awsRestjson1_serializeOpDeleteApp) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1247,13 +1162,8 @@ func (m *awsRestjson1_serializeOpDeleteBaiduChannel) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/baidu") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1310,13 +1220,8 @@ func (m *awsRestjson1_serializeOpDeleteCampaign) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/campaigns/{CampaignId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1382,13 +1287,8 @@ func (m *awsRestjson1_serializeOpDeleteEmailChannel) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/email") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1445,13 +1345,8 @@ func (m *awsRestjson1_serializeOpDeleteEmailTemplate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/email") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1512,13 +1407,8 @@ func (m *awsRestjson1_serializeOpDeleteEndpoint) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/endpoints/{EndpointId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1584,13 +1474,8 @@ func (m *awsRestjson1_serializeOpDeleteEventStream) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/eventstream") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1647,13 +1532,8 @@ func (m *awsRestjson1_serializeOpDeleteGcmChannel) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/gcm") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1710,13 +1590,8 @@ func (m *awsRestjson1_serializeOpDeleteJourney) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/journeys/{JourneyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1782,13 +1657,8 @@ func (m *awsRestjson1_serializeOpDeletePushTemplate) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/push") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1849,13 +1719,8 @@ func (m *awsRestjson1_serializeOpDeleteRecommenderConfiguration) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/v1/recommenders/{RecommenderId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1912,13 +1777,8 @@ func (m *awsRestjson1_serializeOpDeleteSegment) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/segments/{SegmentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1984,13 +1844,8 @@ func (m *awsRestjson1_serializeOpDeleteSmsChannel) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/sms") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2047,13 +1902,8 @@ func (m *awsRestjson1_serializeOpDeleteSmsTemplate) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/sms") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2114,13 +1964,8 @@ func (m *awsRestjson1_serializeOpDeleteUserEndpoints) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/users/{UserId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2186,13 +2031,8 @@ func (m *awsRestjson1_serializeOpDeleteVoiceChannel) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/voice") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2249,13 +2089,8 @@ func (m *awsRestjson1_serializeOpDeleteVoiceTemplate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/voice") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2316,13 +2151,8 @@ func (m *awsRestjson1_serializeOpGetAdmChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/adm") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2379,13 +2209,8 @@ func (m *awsRestjson1_serializeOpGetApnsChannel) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/apns") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2442,13 +2267,8 @@ func (m *awsRestjson1_serializeOpGetApnsSandboxChannel) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/apns_sandbox") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2505,13 +2325,8 @@ func (m *awsRestjson1_serializeOpGetApnsVoipChannel) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/apns_voip") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2568,13 +2383,8 @@ func (m *awsRestjson1_serializeOpGetApnsVoipSandboxChannel) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/apns_voip_sandbox") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2631,13 +2441,8 @@ func (m *awsRestjson1_serializeOpGetApp) HandleSerialize(ctx context.Context, in } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2694,13 +2499,8 @@ func (m *awsRestjson1_serializeOpGetApplicationDateRangeKpi) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/kpis/daterange/{KpiName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2782,13 +2582,8 @@ func (m *awsRestjson1_serializeOpGetApplicationSettings) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2845,13 +2640,8 @@ func (m *awsRestjson1_serializeOpGetApps) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/v1/apps") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2907,13 +2697,8 @@ func (m *awsRestjson1_serializeOpGetBaiduChannel) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/baidu") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2970,13 +2755,8 @@ func (m *awsRestjson1_serializeOpGetCampaign) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/campaigns/{CampaignId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3042,13 +2822,8 @@ func (m *awsRestjson1_serializeOpGetCampaignActivities) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/campaigns/{CampaignId}/activities") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3122,13 +2897,8 @@ func (m *awsRestjson1_serializeOpGetCampaignDateRangeKpi) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/campaigns/{CampaignId}/kpis/daterange/{KpiName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3219,13 +2989,8 @@ func (m *awsRestjson1_serializeOpGetCampaigns) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/campaigns") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3290,13 +3055,8 @@ func (m *awsRestjson1_serializeOpGetCampaignVersion) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/campaigns/{CampaignId}/versions/{Version}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3371,13 +3131,8 @@ func (m *awsRestjson1_serializeOpGetCampaignVersions) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/campaigns/{CampaignId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3451,13 +3206,8 @@ func (m *awsRestjson1_serializeOpGetChannels) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3514,13 +3264,8 @@ func (m *awsRestjson1_serializeOpGetEmailChannel) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/email") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3577,13 +3322,8 @@ func (m *awsRestjson1_serializeOpGetEmailTemplate) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/email") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3644,13 +3384,8 @@ func (m *awsRestjson1_serializeOpGetEndpoint) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/endpoints/{EndpointId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3716,13 +3451,8 @@ func (m *awsRestjson1_serializeOpGetEventStream) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/eventstream") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3779,13 +3509,8 @@ func (m *awsRestjson1_serializeOpGetExportJob) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/jobs/export/{JobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3851,13 +3576,8 @@ func (m *awsRestjson1_serializeOpGetExportJobs) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/jobs/export") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3922,13 +3642,8 @@ func (m *awsRestjson1_serializeOpGetGcmChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/gcm") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3985,13 +3700,8 @@ func (m *awsRestjson1_serializeOpGetImportJob) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/jobs/import/{JobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4057,13 +3767,8 @@ func (m *awsRestjson1_serializeOpGetImportJobs) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/jobs/import") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4128,13 +3833,8 @@ func (m *awsRestjson1_serializeOpGetJourney) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/journeys/{JourneyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4200,13 +3900,8 @@ func (m *awsRestjson1_serializeOpGetJourneyDateRangeKpi) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/journeys/{JourneyId}/kpis/daterange/{KpiName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4297,13 +3992,8 @@ func (m *awsRestjson1_serializeOpGetJourneyExecutionActivityMetrics) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/journeys/{JourneyId}/activities/{JourneyActivityId}/execution-metrics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4386,13 +4076,8 @@ func (m *awsRestjson1_serializeOpGetJourneyExecutionMetrics) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/journeys/{JourneyId}/execution-metrics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4466,13 +4151,8 @@ func (m *awsRestjson1_serializeOpGetPushTemplate) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/push") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4533,13 +4213,8 @@ func (m *awsRestjson1_serializeOpGetRecommenderConfiguration) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/v1/recommenders/{RecommenderId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4596,13 +4271,8 @@ func (m *awsRestjson1_serializeOpGetRecommenderConfigurations) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/v1/recommenders") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4658,13 +4328,8 @@ func (m *awsRestjson1_serializeOpGetSegment) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/segments/{SegmentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4730,13 +4395,8 @@ func (m *awsRestjson1_serializeOpGetSegmentExportJobs) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/segments/{SegmentId}/jobs/export") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4810,13 +4470,8 @@ func (m *awsRestjson1_serializeOpGetSegmentImportJobs) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/segments/{SegmentId}/jobs/import") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4890,13 +4545,8 @@ func (m *awsRestjson1_serializeOpGetSegments) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/segments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4961,13 +4611,8 @@ func (m *awsRestjson1_serializeOpGetSegmentVersion) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/segments/{SegmentId}/versions/{Version}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5042,13 +4687,8 @@ func (m *awsRestjson1_serializeOpGetSegmentVersions) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/segments/{SegmentId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5122,13 +4762,8 @@ func (m *awsRestjson1_serializeOpGetSmsChannel) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/sms") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5185,13 +4820,8 @@ func (m *awsRestjson1_serializeOpGetSmsTemplate) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/sms") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5252,13 +4882,8 @@ func (m *awsRestjson1_serializeOpGetUserEndpoints) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/users/{UserId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5324,13 +4949,8 @@ func (m *awsRestjson1_serializeOpGetVoiceChannel) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/voice") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5387,13 +5007,8 @@ func (m *awsRestjson1_serializeOpGetVoiceTemplate) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/voice") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5454,13 +5069,8 @@ func (m *awsRestjson1_serializeOpListJourneys) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/journeys") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5525,13 +5135,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5588,13 +5193,8 @@ func (m *awsRestjson1_serializeOpListTemplates) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/templates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5658,13 +5258,8 @@ func (m *awsRestjson1_serializeOpListTemplateVersions) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/{TemplateType}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5738,13 +5333,8 @@ func (m *awsRestjson1_serializeOpPhoneNumberValidate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/phone/number/validate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5803,13 +5393,8 @@ func (m *awsRestjson1_serializeOpPutEvents) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/events") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5881,13 +5466,8 @@ func (m *awsRestjson1_serializeOpPutEventStream) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/eventstream") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5959,13 +5539,8 @@ func (m *awsRestjson1_serializeOpRemoveAttributes) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/attributes/{AttributeType}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6046,13 +5621,8 @@ func (m *awsRestjson1_serializeOpSendMessages) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/messages") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6124,13 +5694,8 @@ func (m *awsRestjson1_serializeOpSendUsersMessages) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/users-messages") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6202,13 +5767,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6280,13 +5840,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6349,13 +5904,8 @@ func (m *awsRestjson1_serializeOpUpdateAdmChannel) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/adm") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6427,13 +5977,8 @@ func (m *awsRestjson1_serializeOpUpdateApnsChannel) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/apns") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6505,13 +6050,8 @@ func (m *awsRestjson1_serializeOpUpdateApnsSandboxChannel) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/apns_sandbox") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6583,13 +6123,8 @@ func (m *awsRestjson1_serializeOpUpdateApnsVoipChannel) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/apns_voip") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6661,13 +6196,8 @@ func (m *awsRestjson1_serializeOpUpdateApnsVoipSandboxChannel) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/apns_voip_sandbox") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6739,13 +6269,8 @@ func (m *awsRestjson1_serializeOpUpdateApplicationSettings) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6817,13 +6342,8 @@ func (m *awsRestjson1_serializeOpUpdateBaiduChannel) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/baidu") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6895,13 +6415,8 @@ func (m *awsRestjson1_serializeOpUpdateCampaign) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/campaigns/{CampaignId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6982,13 +6497,8 @@ func (m *awsRestjson1_serializeOpUpdateEmailChannel) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/email") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7060,13 +6570,8 @@ func (m *awsRestjson1_serializeOpUpdateEmailTemplate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/email") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7146,13 +6651,8 @@ func (m *awsRestjson1_serializeOpUpdateEndpoint) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/endpoints/{EndpointId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7233,13 +6733,8 @@ func (m *awsRestjson1_serializeOpUpdateEndpointsBatch) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/endpoints") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7311,13 +6806,8 @@ func (m *awsRestjson1_serializeOpUpdateGcmChannel) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/gcm") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7389,13 +6879,8 @@ func (m *awsRestjson1_serializeOpUpdateJourney) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/journeys/{JourneyId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7476,13 +6961,8 @@ func (m *awsRestjson1_serializeOpUpdateJourneyState) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/journeys/{JourneyId}/state") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7563,13 +7043,8 @@ func (m *awsRestjson1_serializeOpUpdatePushTemplate) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/push") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7649,13 +7124,8 @@ func (m *awsRestjson1_serializeOpUpdateRecommenderConfiguration) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/v1/recommenders/{RecommenderId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7727,13 +7197,8 @@ func (m *awsRestjson1_serializeOpUpdateSegment) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/segments/{SegmentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7814,13 +7279,8 @@ func (m *awsRestjson1_serializeOpUpdateSmsChannel) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/sms") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7892,13 +7352,8 @@ func (m *awsRestjson1_serializeOpUpdateSmsTemplate) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/sms") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7978,13 +7433,8 @@ func (m *awsRestjson1_serializeOpUpdateTemplateActiveVersion) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/{TemplateType}/active-version") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8065,13 +7515,8 @@ func (m *awsRestjson1_serializeOpUpdateVoiceChannel) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/apps/{ApplicationId}/channels/voice") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8143,13 +7588,8 @@ func (m *awsRestjson1_serializeOpUpdateVoiceTemplate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/templates/{TemplateName}/voice") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/pinpointemail/go.mod b/service/pinpointemail/go.mod index 3e6e62f484c..3a2fbc3f0ef 100644 --- a/service/pinpointemail/go.mod +++ b/service/pinpointemail/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pinpointemail/go.sum b/service/pinpointemail/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/pinpointemail/go.sum +++ b/service/pinpointemail/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/pinpointemail/serializers.go b/service/pinpointemail/serializers.go index 5a87bb4b808..44d1e4b182e 100644 --- a/service/pinpointemail/serializers.go +++ b/service/pinpointemail/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpCreateConfigurationSet) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v1/email/configuration-sets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -145,13 +140,8 @@ func (m *awsRestjson1_serializeOpCreateConfigurationSetEventDestination) HandleS } opPath, opQuery := httpbinding.SplitURI("/v1/email/configuration-sets/{ConfigurationSetName}/event-destinations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -238,13 +228,8 @@ func (m *awsRestjson1_serializeOpCreateDedicatedIpPool) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/email/dedicated-ip-pools") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -318,13 +303,8 @@ func (m *awsRestjson1_serializeOpCreateDeliverabilityTestReport) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/v1/email/deliverability-dashboard/test") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -410,13 +390,8 @@ func (m *awsRestjson1_serializeOpCreateEmailIdentity) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/email/identities") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -490,13 +465,8 @@ func (m *awsRestjson1_serializeOpDeleteConfigurationSet) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v1/email/configuration-sets/{ConfigurationSetName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -553,13 +523,8 @@ func (m *awsRestjson1_serializeOpDeleteConfigurationSetEventDestination) HandleS } opPath, opQuery := httpbinding.SplitURI("/v1/email/configuration-sets/{ConfigurationSetName}/event-destinations/{EventDestinationName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -625,13 +590,8 @@ func (m *awsRestjson1_serializeOpDeleteDedicatedIpPool) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/email/dedicated-ip-pools/{PoolName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -688,13 +648,8 @@ func (m *awsRestjson1_serializeOpDeleteEmailIdentity) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/email/identities/{EmailIdentity}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -751,13 +706,8 @@ func (m *awsRestjson1_serializeOpGetAccount) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/email/account") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -801,13 +751,8 @@ func (m *awsRestjson1_serializeOpGetBlacklistReports) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/email/deliverability-dashboard/blacklist-report") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -861,13 +806,8 @@ func (m *awsRestjson1_serializeOpGetConfigurationSet) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/email/configuration-sets/{ConfigurationSetName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -924,13 +864,8 @@ func (m *awsRestjson1_serializeOpGetConfigurationSetEventDestinations) HandleSer } opPath, opQuery := httpbinding.SplitURI("/v1/email/configuration-sets/{ConfigurationSetName}/event-destinations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -987,13 +922,8 @@ func (m *awsRestjson1_serializeOpGetDedicatedIp) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/email/dedicated-ips/{Ip}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1050,13 +980,8 @@ func (m *awsRestjson1_serializeOpGetDedicatedIps) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v1/email/dedicated-ips") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1116,13 +1041,8 @@ func (m *awsRestjson1_serializeOpGetDeliverabilityDashboardOptions) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/v1/email/deliverability-dashboard") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1166,13 +1086,8 @@ func (m *awsRestjson1_serializeOpGetDeliverabilityTestReport) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/v1/email/deliverability-dashboard/test-reports/{ReportId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1229,13 +1144,8 @@ func (m *awsRestjson1_serializeOpGetDomainDeliverabilityCampaign) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/v1/email/deliverability-dashboard/campaigns/{CampaignId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1292,13 +1202,8 @@ func (m *awsRestjson1_serializeOpGetDomainStatisticsReport) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v1/email/deliverability-dashboard/statistics-report/{Domain}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1363,13 +1268,8 @@ func (m *awsRestjson1_serializeOpGetEmailIdentity) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/email/identities/{EmailIdentity}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1426,13 +1326,8 @@ func (m *awsRestjson1_serializeOpListConfigurationSets) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/email/configuration-sets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1488,13 +1383,8 @@ func (m *awsRestjson1_serializeOpListDedicatedIpPools) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v1/email/dedicated-ip-pools") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1550,13 +1440,8 @@ func (m *awsRestjson1_serializeOpListDeliverabilityTestReports) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/v1/email/deliverability-dashboard/test-reports") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1612,13 +1497,8 @@ func (m *awsRestjson1_serializeOpListDomainDeliverabilityCampaigns) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/v1/email/deliverability-dashboard/domains/{SubscribedDomain}/campaigns") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1691,13 +1571,8 @@ func (m *awsRestjson1_serializeOpListEmailIdentities) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/email/identities") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1753,13 +1628,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/email/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1811,13 +1681,8 @@ func (m *awsRestjson1_serializeOpPutAccountDedicatedIpWarmupAttributes) HandleSe } opPath, opQuery := httpbinding.SplitURI("/v1/email/account/dedicated-ips/warmup") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1884,13 +1749,8 @@ func (m *awsRestjson1_serializeOpPutAccountSendingAttributes) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/v1/email/account/sending") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1957,13 +1817,8 @@ func (m *awsRestjson1_serializeOpPutConfigurationSetDeliveryOptions) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/v1/email/configuration-sets/{ConfigurationSetName}/delivery-options") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2048,13 +1903,8 @@ func (m *awsRestjson1_serializeOpPutConfigurationSetReputationOptions) HandleSer } opPath, opQuery := httpbinding.SplitURI("/v1/email/configuration-sets/{ConfigurationSetName}/reputation-options") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2134,13 +1984,8 @@ func (m *awsRestjson1_serializeOpPutConfigurationSetSendingOptions) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/v1/email/configuration-sets/{ConfigurationSetName}/sending") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2220,13 +2065,8 @@ func (m *awsRestjson1_serializeOpPutConfigurationSetTrackingOptions) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/v1/email/configuration-sets/{ConfigurationSetName}/tracking-options") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2306,13 +2146,8 @@ func (m *awsRestjson1_serializeOpPutDedicatedIpInPool) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v1/email/dedicated-ips/{Ip}/pool") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2392,13 +2227,8 @@ func (m *awsRestjson1_serializeOpPutDedicatedIpWarmupAttributes) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/v1/email/dedicated-ips/{Ip}/warmup") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2478,13 +2308,8 @@ func (m *awsRestjson1_serializeOpPutDeliverabilityDashboardOption) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/v1/email/deliverability-dashboard") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2558,13 +2383,8 @@ func (m *awsRestjson1_serializeOpPutEmailIdentityDkimAttributes) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/v1/email/identities/{EmailIdentity}/dkim") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2644,13 +2464,8 @@ func (m *awsRestjson1_serializeOpPutEmailIdentityFeedbackAttributes) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/v1/email/identities/{EmailIdentity}/feedback") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2730,13 +2545,8 @@ func (m *awsRestjson1_serializeOpPutEmailIdentityMailFromAttributes) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/v1/email/identities/{EmailIdentity}/mail-from") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2821,13 +2631,8 @@ func (m *awsRestjson1_serializeOpSendEmail) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v1/email/outbound-emails") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2932,13 +2737,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/email/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3012,13 +2812,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/email/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3076,13 +2871,8 @@ func (m *awsRestjson1_serializeOpUpdateConfigurationSetEventDestination) HandleS } opPath, opQuery := httpbinding.SplitURI("/v1/email/configuration-sets/{ConfigurationSetName}/event-destinations/{EventDestinationName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/pinpointsmsvoice/go.mod b/service/pinpointsmsvoice/go.mod index a9faead063e..998346d2a6d 100644 --- a/service/pinpointsmsvoice/go.mod +++ b/service/pinpointsmsvoice/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/pinpointsmsvoice/go.sum b/service/pinpointsmsvoice/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/pinpointsmsvoice/go.sum +++ b/service/pinpointsmsvoice/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/pinpointsmsvoice/serializers.go b/service/pinpointsmsvoice/serializers.go index 0021aa0f3c5..48ec8ff2844 100644 --- a/service/pinpointsmsvoice/serializers.go +++ b/service/pinpointsmsvoice/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateConfigurationSet) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v1/sms-voice/configuration-sets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -109,13 +104,8 @@ func (m *awsRestjson1_serializeOpCreateConfigurationSetEventDestination) HandleS } opPath, opQuery := httpbinding.SplitURI("/v1/sms-voice/configuration-sets/{ConfigurationSetName}/event-destinations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -202,13 +192,8 @@ func (m *awsRestjson1_serializeOpDeleteConfigurationSet) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v1/sms-voice/configuration-sets/{ConfigurationSetName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -265,13 +250,8 @@ func (m *awsRestjson1_serializeOpDeleteConfigurationSetEventDestination) HandleS } opPath, opQuery := httpbinding.SplitURI("/v1/sms-voice/configuration-sets/{ConfigurationSetName}/event-destinations/{EventDestinationName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -337,13 +317,8 @@ func (m *awsRestjson1_serializeOpGetConfigurationSetEventDestinations) HandleSer } opPath, opQuery := httpbinding.SplitURI("/v1/sms-voice/configuration-sets/{ConfigurationSetName}/event-destinations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -400,13 +375,8 @@ func (m *awsRestjson1_serializeOpListConfigurationSets) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v1/sms-voice/configuration-sets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -462,13 +432,8 @@ func (m *awsRestjson1_serializeOpSendVoiceMessage) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/sms-voice/voice/message") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -557,13 +522,8 @@ func (m *awsRestjson1_serializeOpUpdateConfigurationSetEventDestination) HandleS } opPath, opQuery := httpbinding.SplitURI("/v1/sms-voice/configuration-sets/{ConfigurationSetName}/event-destinations/{EventDestinationName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/polly/go.mod b/service/polly/go.mod index 7c04c3853fd..4a6abd8a5d3 100644 --- a/service/polly/go.mod +++ b/service/polly/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/polly/go.sum b/service/polly/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/polly/go.sum +++ b/service/polly/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/polly/serializers.go b/service/polly/serializers.go index 1888df85ed1..efedb6c6ac7 100644 --- a/service/polly/serializers.go +++ b/service/polly/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpDeleteLexicon) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/lexicons/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -99,13 +94,8 @@ func (m *awsRestjson1_serializeOpDescribeVoices) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/voices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -169,13 +159,8 @@ func (m *awsRestjson1_serializeOpGetLexicon) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/lexicons/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -232,13 +217,8 @@ func (m *awsRestjson1_serializeOpGetSpeechSynthesisTask) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v1/synthesisTasks/{TaskId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -295,13 +275,8 @@ func (m *awsRestjson1_serializeOpListLexicons) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/lexicons") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -353,13 +328,8 @@ func (m *awsRestjson1_serializeOpListSpeechSynthesisTasks) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/v1/synthesisTasks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -419,13 +389,8 @@ func (m *awsRestjson1_serializeOpPutLexicon) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v1/lexicons/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -505,13 +470,8 @@ func (m *awsRestjson1_serializeOpStartSpeechSynthesisTask) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/v1/synthesisTasks") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -637,13 +597,8 @@ func (m *awsRestjson1_serializeOpSynthesizeSpeech) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/speech") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/qldb/go.mod b/service/qldb/go.mod index 49f75dcc6ab..dac2439727b 100644 --- a/service/qldb/go.mod +++ b/service/qldb/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/qldb/go.sum b/service/qldb/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/qldb/go.sum +++ b/service/qldb/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/qldb/serializers.go b/service/qldb/serializers.go index 8728c9e625d..cf498d81c95 100644 --- a/service/qldb/serializers.go +++ b/service/qldb/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpCancelJournalKinesisStream) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/ledgers/{LedgerName}/journal-kinesis-streams/{StreamId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -109,13 +104,8 @@ func (m *awsRestjson1_serializeOpCreateLedger) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/ledgers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -199,13 +189,8 @@ func (m *awsRestjson1_serializeOpDeleteLedger) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/ledgers/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -262,13 +247,8 @@ func (m *awsRestjson1_serializeOpDescribeJournalKinesisStream) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/ledgers/{LedgerName}/journal-kinesis-streams/{StreamId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -334,13 +314,8 @@ func (m *awsRestjson1_serializeOpDescribeJournalS3Export) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/ledgers/{Name}/journal-s3-exports/{ExportId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -406,13 +381,8 @@ func (m *awsRestjson1_serializeOpDescribeLedger) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/ledgers/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -469,13 +439,8 @@ func (m *awsRestjson1_serializeOpExportJournalToS3) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/ledgers/{Name}/journal-s3-exports") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -572,13 +537,8 @@ func (m *awsRestjson1_serializeOpGetBlock) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/ledgers/{Name}/block") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -667,13 +627,8 @@ func (m *awsRestjson1_serializeOpGetDigest) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/ledgers/{Name}/digest") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -730,13 +685,8 @@ func (m *awsRestjson1_serializeOpGetRevision) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/ledgers/{Name}/revision") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -830,13 +780,8 @@ func (m *awsRestjson1_serializeOpListJournalKinesisStreamsForLedger) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/ledgers/{LedgerName}/journal-kinesis-streams") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -901,13 +846,8 @@ func (m *awsRestjson1_serializeOpListJournalS3Exports) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/journal-s3-exports") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -963,13 +903,8 @@ func (m *awsRestjson1_serializeOpListJournalS3ExportsForLedger) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/ledgers/{Name}/journal-s3-exports") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1034,13 +969,8 @@ func (m *awsRestjson1_serializeOpListLedgers) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/ledgers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1096,13 +1026,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1159,13 +1084,8 @@ func (m *awsRestjson1_serializeOpStreamJournalToKinesis) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/ledgers/{LedgerName}/journal-kinesis-streams") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1274,13 +1194,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1362,13 +1277,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1431,13 +1341,8 @@ func (m *awsRestjson1_serializeOpUpdateLedger) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/ledgers/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/quicksight/go.mod b/service/quicksight/go.mod index 15c4af43020..00639c6b976 100644 --- a/service/quicksight/go.mod +++ b/service/quicksight/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/quicksight/go.sum b/service/quicksight/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/quicksight/go.sum +++ b/service/quicksight/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/quicksight/serializers.go b/service/quicksight/serializers.go index 1b686811cd2..2b79bef3e11 100644 --- a/service/quicksight/serializers.go +++ b/service/quicksight/serializers.go @@ -38,13 +38,8 @@ func (m *awsRestjson1_serializeOpCancelIngestion) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sets/{DataSetId}/ingestions/{IngestionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -119,13 +114,8 @@ func (m *awsRestjson1_serializeOpCreateAccountCustomization) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/customizations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -218,13 +208,8 @@ func (m *awsRestjson1_serializeOpCreateAnalysis) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/analyses/{AnalysisId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -346,13 +331,8 @@ func (m *awsRestjson1_serializeOpCreateDashboard) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/dashboards/{DashboardId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -486,13 +466,8 @@ func (m *awsRestjson1_serializeOpCreateDataSet) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -638,13 +613,8 @@ func (m *awsRestjson1_serializeOpCreateDataSource) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -776,13 +746,8 @@ func (m *awsRestjson1_serializeOpCreateGroup) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -876,13 +841,8 @@ func (m *awsRestjson1_serializeOpCreateGroupMembership) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/groups/{GroupName}/members/{MemberName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -966,13 +926,8 @@ func (m *awsRestjson1_serializeOpCreateIAMPolicyAssignment) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/iam-policy-assignments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1078,13 +1033,8 @@ func (m *awsRestjson1_serializeOpCreateIngestion) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sets/{DataSetId}/ingestions/{IngestionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1159,13 +1109,8 @@ func (m *awsRestjson1_serializeOpCreateNamespace) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1257,13 +1202,8 @@ func (m *awsRestjson1_serializeOpCreateTemplate) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/templates/{TemplateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1378,13 +1318,8 @@ func (m *awsRestjson1_serializeOpCreateTemplateAlias) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/templates/{TemplateId}/aliases/{AliasName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1482,13 +1417,8 @@ func (m *awsRestjson1_serializeOpCreateTheme) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/themes/{ThemeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1608,13 +1538,8 @@ func (m *awsRestjson1_serializeOpCreateThemeAlias) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/themes/{ThemeId}/aliases/{AliasName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1712,13 +1637,8 @@ func (m *awsRestjson1_serializeOpDeleteAccountCustomization) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/customizations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1779,13 +1699,8 @@ func (m *awsRestjson1_serializeOpDeleteAnalysis) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/analyses/{AnalysisId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1859,13 +1774,8 @@ func (m *awsRestjson1_serializeOpDeleteDashboard) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/dashboards/{DashboardId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1935,13 +1845,8 @@ func (m *awsRestjson1_serializeOpDeleteDataSet) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sets/{DataSetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2007,13 +1912,8 @@ func (m *awsRestjson1_serializeOpDeleteDataSource) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sources/{DataSourceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2079,13 +1979,8 @@ func (m *awsRestjson1_serializeOpDeleteGroup) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/groups/{GroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2160,13 +2055,8 @@ func (m *awsRestjson1_serializeOpDeleteGroupMembership) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/groups/{GroupName}/members/{MemberName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2250,13 +2140,8 @@ func (m *awsRestjson1_serializeOpDeleteIAMPolicyAssignment) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespace/{Namespace}/iam-policy-assignments/{AssignmentName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2331,13 +2216,8 @@ func (m *awsRestjson1_serializeOpDeleteNamespace) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2403,13 +2283,8 @@ func (m *awsRestjson1_serializeOpDeleteTemplate) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/templates/{TemplateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2479,13 +2354,8 @@ func (m *awsRestjson1_serializeOpDeleteTemplateAlias) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/templates/{TemplateId}/aliases/{AliasName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2560,13 +2430,8 @@ func (m *awsRestjson1_serializeOpDeleteTheme) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/themes/{ThemeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2636,13 +2501,8 @@ func (m *awsRestjson1_serializeOpDeleteThemeAlias) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/themes/{ThemeId}/aliases/{AliasName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2717,13 +2577,8 @@ func (m *awsRestjson1_serializeOpDeleteUser) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/users/{UserName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2798,13 +2653,8 @@ func (m *awsRestjson1_serializeOpDeleteUserByPrincipalId) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/user-principals/{PrincipalId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2879,13 +2729,8 @@ func (m *awsRestjson1_serializeOpDescribeAccountCustomization) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/customizations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2950,13 +2795,8 @@ func (m *awsRestjson1_serializeOpDescribeAccountSettings) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3013,13 +2853,8 @@ func (m *awsRestjson1_serializeOpDescribeAnalysis) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/analyses/{AnalysisId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3085,13 +2920,8 @@ func (m *awsRestjson1_serializeOpDescribeAnalysisPermissions) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/analyses/{AnalysisId}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3157,13 +2987,8 @@ func (m *awsRestjson1_serializeOpDescribeDashboard) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/dashboards/{DashboardId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3237,13 +3062,8 @@ func (m *awsRestjson1_serializeOpDescribeDashboardPermissions) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/dashboards/{DashboardId}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3309,13 +3129,8 @@ func (m *awsRestjson1_serializeOpDescribeDataSet) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sets/{DataSetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3381,13 +3196,8 @@ func (m *awsRestjson1_serializeOpDescribeDataSetPermissions) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sets/{DataSetId}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3453,13 +3263,8 @@ func (m *awsRestjson1_serializeOpDescribeDataSource) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sources/{DataSourceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3525,13 +3330,8 @@ func (m *awsRestjson1_serializeOpDescribeDataSourcePermissions) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sources/{DataSourceId}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3597,13 +3397,8 @@ func (m *awsRestjson1_serializeOpDescribeGroup) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/groups/{GroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3678,13 +3473,8 @@ func (m *awsRestjson1_serializeOpDescribeIAMPolicyAssignment) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/iam-policy-assignments/{AssignmentName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3759,13 +3549,8 @@ func (m *awsRestjson1_serializeOpDescribeIngestion) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sets/{DataSetId}/ingestions/{IngestionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3840,13 +3625,8 @@ func (m *awsRestjson1_serializeOpDescribeNamespace) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3912,13 +3692,8 @@ func (m *awsRestjson1_serializeOpDescribeTemplate) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/templates/{TemplateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3992,13 +3767,8 @@ func (m *awsRestjson1_serializeOpDescribeTemplateAlias) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/templates/{TemplateId}/aliases/{AliasName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4073,13 +3843,8 @@ func (m *awsRestjson1_serializeOpDescribeTemplatePermissions) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/templates/{TemplateId}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4145,13 +3910,8 @@ func (m *awsRestjson1_serializeOpDescribeTheme) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/themes/{ThemeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4225,13 +3985,8 @@ func (m *awsRestjson1_serializeOpDescribeThemeAlias) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/themes/{ThemeId}/aliases/{AliasName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4306,13 +4061,8 @@ func (m *awsRestjson1_serializeOpDescribeThemePermissions) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/themes/{ThemeId}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4378,13 +4128,8 @@ func (m *awsRestjson1_serializeOpDescribeUser) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/users/{UserName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4459,13 +4204,8 @@ func (m *awsRestjson1_serializeOpGetDashboardEmbedUrl) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/dashboards/{DashboardId}/embed-url") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4565,13 +4305,8 @@ func (m *awsRestjson1_serializeOpGetSessionEmbedUrl) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/session-embed-url") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4640,13 +4375,8 @@ func (m *awsRestjson1_serializeOpListAnalyses) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/analyses") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4711,13 +4441,8 @@ func (m *awsRestjson1_serializeOpListDashboards) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/dashboards") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4782,13 +4507,8 @@ func (m *awsRestjson1_serializeOpListDashboardVersions) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/dashboards/{DashboardId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4862,13 +4582,8 @@ func (m *awsRestjson1_serializeOpListDataSets) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4933,13 +4648,8 @@ func (m *awsRestjson1_serializeOpListDataSources) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5004,13 +4714,8 @@ func (m *awsRestjson1_serializeOpListGroupMemberships) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/groups/{GroupName}/members") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5093,13 +4798,8 @@ func (m *awsRestjson1_serializeOpListGroups) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5173,13 +4873,8 @@ func (m *awsRestjson1_serializeOpListIAMPolicyAssignments) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/iam-policy-assignments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5276,13 +4971,8 @@ func (m *awsRestjson1_serializeOpListIAMPolicyAssignmentsForUser) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/users/{UserName}/iam-policy-assignments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5365,13 +5055,8 @@ func (m *awsRestjson1_serializeOpListIngestions) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sets/{DataSetId}/ingestions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5445,13 +5130,8 @@ func (m *awsRestjson1_serializeOpListNamespaces) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5516,13 +5196,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/resources/{ResourceArn}/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5579,13 +5254,8 @@ func (m *awsRestjson1_serializeOpListTemplateAliases) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/templates/{TemplateId}/aliases") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5659,13 +5329,8 @@ func (m *awsRestjson1_serializeOpListTemplates) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/templates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5730,13 +5395,8 @@ func (m *awsRestjson1_serializeOpListTemplateVersions) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/templates/{TemplateId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5810,13 +5470,8 @@ func (m *awsRestjson1_serializeOpListThemeAliases) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/themes/{ThemeId}/aliases") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5890,13 +5545,8 @@ func (m *awsRestjson1_serializeOpListThemes) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/themes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5965,13 +5615,8 @@ func (m *awsRestjson1_serializeOpListThemeVersions) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/themes/{ThemeId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6045,13 +5690,8 @@ func (m *awsRestjson1_serializeOpListUserGroups) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/users/{UserName}/groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6134,13 +5774,8 @@ func (m *awsRestjson1_serializeOpListUsers) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/users") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6214,13 +5849,8 @@ func (m *awsRestjson1_serializeOpRegisterUser) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/users") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6339,13 +5969,8 @@ func (m *awsRestjson1_serializeOpRestoreAnalysis) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/restore/analyses/{AnalysisId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6411,13 +6036,8 @@ func (m *awsRestjson1_serializeOpSearchAnalyses) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/search/analyses") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6509,13 +6129,8 @@ func (m *awsRestjson1_serializeOpSearchDashboards) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/search/dashboards") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6607,13 +6222,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/resources/{ResourceArn}/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6695,13 +6305,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/resources/{ResourceArn}/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6764,13 +6369,8 @@ func (m *awsRestjson1_serializeOpUpdateAccountCustomization) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/customizations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6856,13 +6456,8 @@ func (m *awsRestjson1_serializeOpUpdateAccountSettings) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/settings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6947,13 +6542,8 @@ func (m *awsRestjson1_serializeOpUpdateAnalysis) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/analyses/{AnalysisId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7061,13 +6651,8 @@ func (m *awsRestjson1_serializeOpUpdateAnalysisPermissions) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/analyses/{AnalysisId}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7165,13 +6750,8 @@ func (m *awsRestjson1_serializeOpUpdateDashboard) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/dashboards/{DashboardId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7291,13 +6871,8 @@ func (m *awsRestjson1_serializeOpUpdateDashboardPermissions) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/dashboards/{DashboardId}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7395,13 +6970,8 @@ func (m *awsRestjson1_serializeOpUpdateDashboardPublishedVersion) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/dashboards/{DashboardId}/versions/{VersionNumber}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7476,13 +7046,8 @@ func (m *awsRestjson1_serializeOpUpdateDataSet) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sets/{DataSetId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7618,13 +7183,8 @@ func (m *awsRestjson1_serializeOpUpdateDataSetPermissions) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sets/{DataSetId}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7722,13 +7282,8 @@ func (m *awsRestjson1_serializeOpUpdateDataSource) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sources/{DataSourceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7845,13 +7400,8 @@ func (m *awsRestjson1_serializeOpUpdateDataSourcePermissions) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/data-sources/{DataSourceId}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7949,13 +7499,8 @@ func (m *awsRestjson1_serializeOpUpdateGroup) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/groups/{GroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8053,13 +7598,8 @@ func (m *awsRestjson1_serializeOpUpdateIAMPolicyAssignment) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/iam-policy-assignments/{AssignmentName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8169,13 +7709,8 @@ func (m *awsRestjson1_serializeOpUpdateTemplate) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/templates/{TemplateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8276,13 +7811,8 @@ func (m *awsRestjson1_serializeOpUpdateTemplateAlias) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/templates/{TemplateId}/aliases/{AliasName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8380,13 +7910,8 @@ func (m *awsRestjson1_serializeOpUpdateTemplatePermissions) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/templates/{TemplateId}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8484,13 +8009,8 @@ func (m *awsRestjson1_serializeOpUpdateTheme) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/themes/{ThemeId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8596,13 +8116,8 @@ func (m *awsRestjson1_serializeOpUpdateThemeAlias) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/themes/{ThemeId}/aliases/{AliasName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8700,13 +8215,8 @@ func (m *awsRestjson1_serializeOpUpdateThemePermissions) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/themes/{ThemeId}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8804,13 +8314,8 @@ func (m *awsRestjson1_serializeOpUpdateUser) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/accounts/{AwsAccountId}/namespaces/{Namespace}/users/{UserName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/ram/go.mod b/service/ram/go.mod index b452c07b275..d314ff49341 100644 --- a/service/ram/go.mod +++ b/service/ram/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ram/go.sum b/service/ram/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/ram/go.sum +++ b/service/ram/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ram/serializers.go b/service/ram/serializers.go index 25550473ce3..c67d3d34170 100644 --- a/service/ram/serializers.go +++ b/service/ram/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAcceptResourceShareInvitation) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/acceptresourceshareinvitation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -114,13 +109,8 @@ func (m *awsRestjson1_serializeOpAssociateResourceShare) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/associateresourceshare") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -206,13 +196,8 @@ func (m *awsRestjson1_serializeOpAssociateResourceSharePermission) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/associateresourcesharepermission") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -294,13 +279,8 @@ func (m *awsRestjson1_serializeOpCreateResourceShare) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/createresourceshare") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -405,13 +385,8 @@ func (m *awsRestjson1_serializeOpDeleteResourceShare) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/deleteresourceshare") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -467,13 +442,8 @@ func (m *awsRestjson1_serializeOpDisassociateResourceShare) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/disassociateresourceshare") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -559,13 +529,8 @@ func (m *awsRestjson1_serializeOpDisassociateResourceSharePermission) HandleSeri } opPath, opQuery := httpbinding.SplitURI("/disassociateresourcesharepermission") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -642,13 +607,8 @@ func (m *awsRestjson1_serializeOpEnableSharingWithAwsOrganization) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/enablesharingwithawsorganization") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -692,13 +652,8 @@ func (m *awsRestjson1_serializeOpGetPermission) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/getpermission") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -770,13 +725,8 @@ func (m *awsRestjson1_serializeOpGetResourcePolicies) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/getresourcepolicies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -860,13 +810,8 @@ func (m *awsRestjson1_serializeOpGetResourceShareAssociations) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/getresourceshareassociations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -965,13 +910,8 @@ func (m *awsRestjson1_serializeOpGetResourceShareInvitations) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/getresourceshareinvitations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1057,13 +997,8 @@ func (m *awsRestjson1_serializeOpGetResourceShares) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/getresourceshares") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1164,13 +1099,8 @@ func (m *awsRestjson1_serializeOpListPendingInvitationResources) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/listpendinginvitationresources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1247,13 +1177,8 @@ func (m *awsRestjson1_serializeOpListPermissions) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/listpermissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1330,13 +1255,8 @@ func (m *awsRestjson1_serializeOpListPrincipals) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/listprincipals") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1437,13 +1357,8 @@ func (m *awsRestjson1_serializeOpListResources) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/listresources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1544,13 +1459,8 @@ func (m *awsRestjson1_serializeOpListResourceSharePermissions) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/listresourcesharepermissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1627,13 +1537,8 @@ func (m *awsRestjson1_serializeOpListResourceTypes) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/listresourcetypes") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1705,13 +1610,8 @@ func (m *awsRestjson1_serializeOpPromoteResourceShareCreatedFromPolicy) HandleSe } opPath, opQuery := httpbinding.SplitURI("/promoteresourcesharecreatedfrompolicy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1763,13 +1663,8 @@ func (m *awsRestjson1_serializeOpRejectResourceShareInvitation) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/rejectresourceshareinvitation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1841,13 +1736,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tagresource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1921,13 +1811,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/untagresource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2001,13 +1886,8 @@ func (m *awsRestjson1_serializeOpUpdateResourceShare) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/updateresourceshare") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/rdsdata/go.mod b/service/rdsdata/go.mod index 306de041204..857fbbede69 100644 --- a/service/rdsdata/go.mod +++ b/service/rdsdata/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/rdsdata/go.sum b/service/rdsdata/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/rdsdata/go.sum +++ b/service/rdsdata/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/rdsdata/serializers.go b/service/rdsdata/serializers.go index 17f4ec855c4..88640a5d1ac 100644 --- a/service/rdsdata/serializers.go +++ b/service/rdsdata/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpBatchExecuteStatement) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/BatchExecute") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -141,13 +136,8 @@ func (m *awsRestjson1_serializeOpBeginTransaction) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/BeginTransaction") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -229,13 +219,8 @@ func (m *awsRestjson1_serializeOpCommitTransaction) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/CommitTransaction") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -312,13 +297,8 @@ func (m *awsRestjson1_serializeOpExecuteSql) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/ExecuteSql") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -405,13 +385,8 @@ func (m *awsRestjson1_serializeOpExecuteStatement) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/Execute") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -527,13 +502,8 @@ func (m *awsRestjson1_serializeOpRollbackTransaction) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/RollbackTransaction") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/resourcegroups/go.mod b/service/resourcegroups/go.mod index 9ee7256d689..3c0cf2eb8a1 100644 --- a/service/resourcegroups/go.mod +++ b/service/resourcegroups/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/resourcegroups/go.sum b/service/resourcegroups/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/resourcegroups/go.sum +++ b/service/resourcegroups/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/resourcegroups/serializers.go b/service/resourcegroups/serializers.go index 6388bd7924d..65f900d2af4 100644 --- a/service/resourcegroups/serializers.go +++ b/service/resourcegroups/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateGroup) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -135,13 +130,8 @@ func (m *awsRestjson1_serializeOpDeleteGroup) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/delete-group") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -213,13 +203,8 @@ func (m *awsRestjson1_serializeOpGetGroup) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/get-group") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -291,13 +276,8 @@ func (m *awsRestjson1_serializeOpGetGroupConfiguration) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/get-group-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -364,13 +344,8 @@ func (m *awsRestjson1_serializeOpGetGroupQuery) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/get-group-query") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -442,13 +417,8 @@ func (m *awsRestjson1_serializeOpGetTags) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/resources/{Arn}/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -505,13 +475,8 @@ func (m *awsRestjson1_serializeOpGroupResources) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/group-resources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -585,13 +550,8 @@ func (m *awsRestjson1_serializeOpListGroupResources) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/list-group-resources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -680,13 +640,8 @@ func (m *awsRestjson1_serializeOpListGroups) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/groups-list") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -767,13 +722,8 @@ func (m *awsRestjson1_serializeOpPutGroupConfiguration) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/put-group-configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -847,13 +797,8 @@ func (m *awsRestjson1_serializeOpSearchResources) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/resources/search") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -932,13 +877,8 @@ func (m *awsRestjson1_serializeOpTag) HandleSerialize(ctx context.Context, in mi } opPath, opQuery := httpbinding.SplitURI("/resources/{Arn}/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1020,13 +960,8 @@ func (m *awsRestjson1_serializeOpUngroupResources) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/ungroup-resources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1100,13 +1035,8 @@ func (m *awsRestjson1_serializeOpUntag) HandleSerialize(ctx context.Context, in } opPath, opQuery := httpbinding.SplitURI("/resources/{Arn}/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1188,13 +1118,8 @@ func (m *awsRestjson1_serializeOpUpdateGroup) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/update-group") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1271,13 +1196,8 @@ func (m *awsRestjson1_serializeOpUpdateGroupQuery) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/update-group-query") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/robomaker/go.mod b/service/robomaker/go.mod index 2b8aba65b23..41b85bd6675 100644 --- a/service/robomaker/go.mod +++ b/service/robomaker/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/robomaker/go.sum b/service/robomaker/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/robomaker/go.sum +++ b/service/robomaker/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/robomaker/serializers.go b/service/robomaker/serializers.go index 4d89516574a..d554ff2f912 100644 --- a/service/robomaker/serializers.go +++ b/service/robomaker/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpBatchDeleteWorlds) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/batchDeleteWorlds") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -111,13 +106,8 @@ func (m *awsRestjson1_serializeOpBatchDescribeSimulationJob) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/batchDescribeSimulationJob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -186,13 +176,8 @@ func (m *awsRestjson1_serializeOpCancelDeploymentJob) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/cancelDeploymentJob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -259,13 +244,8 @@ func (m *awsRestjson1_serializeOpCancelSimulationJob) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/cancelSimulationJob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -332,13 +312,8 @@ func (m *awsRestjson1_serializeOpCancelSimulationJobBatch) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/cancelSimulationJobBatch") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -405,13 +380,8 @@ func (m *awsRestjson1_serializeOpCancelWorldExportJob) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/cancelWorldExportJob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -478,13 +448,8 @@ func (m *awsRestjson1_serializeOpCancelWorldGenerationJob) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/cancelWorldGenerationJob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -551,13 +516,8 @@ func (m *awsRestjson1_serializeOpCreateDeploymentJob) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/createDeploymentJob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -650,13 +610,8 @@ func (m *awsRestjson1_serializeOpCreateFleet) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/createFleet") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -730,13 +685,8 @@ func (m *awsRestjson1_serializeOpCreateRobot) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/createRobot") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -820,13 +770,8 @@ func (m *awsRestjson1_serializeOpCreateRobotApplication) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/createRobotApplication") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -914,13 +859,8 @@ func (m *awsRestjson1_serializeOpCreateRobotApplicationVersion) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/createRobotApplicationVersion") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -992,13 +932,8 @@ func (m *awsRestjson1_serializeOpCreateSimulationApplication) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/createSimulationApplication") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1100,13 +1035,8 @@ func (m *awsRestjson1_serializeOpCreateSimulationApplicationVersion) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/createSimulationApplicationVersion") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1178,13 +1108,8 @@ func (m *awsRestjson1_serializeOpCreateSimulationJob) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/createSimulationJob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1322,13 +1247,8 @@ func (m *awsRestjson1_serializeOpCreateWorldExportJob) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/createWorldExportJob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1421,13 +1341,8 @@ func (m *awsRestjson1_serializeOpCreateWorldGenerationJob) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/createWorldGenerationJob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1520,13 +1435,8 @@ func (m *awsRestjson1_serializeOpCreateWorldTemplate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/createWorldTemplate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1617,13 +1527,8 @@ func (m *awsRestjson1_serializeOpDeleteFleet) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/deleteFleet") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1690,13 +1595,8 @@ func (m *awsRestjson1_serializeOpDeleteRobot) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/deleteRobot") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1763,13 +1663,8 @@ func (m *awsRestjson1_serializeOpDeleteRobotApplication) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/deleteRobotApplication") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1841,13 +1736,8 @@ func (m *awsRestjson1_serializeOpDeleteSimulationApplication) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/deleteSimulationApplication") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1919,13 +1809,8 @@ func (m *awsRestjson1_serializeOpDeleteWorldTemplate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/deleteWorldTemplate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1992,13 +1877,8 @@ func (m *awsRestjson1_serializeOpDeregisterRobot) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/deregisterRobot") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2070,13 +1950,8 @@ func (m *awsRestjson1_serializeOpDescribeDeploymentJob) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/describeDeploymentJob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2143,13 +2018,8 @@ func (m *awsRestjson1_serializeOpDescribeFleet) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/describeFleet") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2216,13 +2086,8 @@ func (m *awsRestjson1_serializeOpDescribeRobot) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/describeRobot") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2289,13 +2154,8 @@ func (m *awsRestjson1_serializeOpDescribeRobotApplication) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/describeRobotApplication") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2367,13 +2227,8 @@ func (m *awsRestjson1_serializeOpDescribeSimulationApplication) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/describeSimulationApplication") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2445,13 +2300,8 @@ func (m *awsRestjson1_serializeOpDescribeSimulationJob) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/describeSimulationJob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2518,13 +2368,8 @@ func (m *awsRestjson1_serializeOpDescribeSimulationJobBatch) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/describeSimulationJobBatch") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2591,13 +2436,8 @@ func (m *awsRestjson1_serializeOpDescribeWorld) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/describeWorld") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2664,13 +2504,8 @@ func (m *awsRestjson1_serializeOpDescribeWorldExportJob) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/describeWorldExportJob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2737,13 +2572,8 @@ func (m *awsRestjson1_serializeOpDescribeWorldGenerationJob) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/describeWorldGenerationJob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2810,13 +2640,8 @@ func (m *awsRestjson1_serializeOpDescribeWorldTemplate) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/describeWorldTemplate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2883,13 +2708,8 @@ func (m *awsRestjson1_serializeOpGetWorldTemplateBody) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/getWorldTemplateBody") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2961,13 +2781,8 @@ func (m *awsRestjson1_serializeOpListDeploymentJobs) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/listDeploymentJobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3046,13 +2861,8 @@ func (m *awsRestjson1_serializeOpListFleets) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/listFleets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3131,13 +2941,8 @@ func (m *awsRestjson1_serializeOpListRobotApplications) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/listRobotApplications") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3221,13 +3026,8 @@ func (m *awsRestjson1_serializeOpListRobots) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/listRobots") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3306,13 +3106,8 @@ func (m *awsRestjson1_serializeOpListSimulationApplications) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/listSimulationApplications") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3396,13 +3191,8 @@ func (m *awsRestjson1_serializeOpListSimulationJobBatches) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/listSimulationJobBatches") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3481,13 +3271,8 @@ func (m *awsRestjson1_serializeOpListSimulationJobs) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/listSimulationJobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3566,13 +3351,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3629,13 +3409,8 @@ func (m *awsRestjson1_serializeOpListWorldExportJobs) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/listWorldExportJobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3714,13 +3489,8 @@ func (m *awsRestjson1_serializeOpListWorldGenerationJobs) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/listWorldGenerationJobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3799,13 +3569,8 @@ func (m *awsRestjson1_serializeOpListWorlds) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/listWorlds") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3884,13 +3649,8 @@ func (m *awsRestjson1_serializeOpListWorldTemplates) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/listWorldTemplates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3962,13 +3722,8 @@ func (m *awsRestjson1_serializeOpRegisterRobot) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/registerRobot") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4040,13 +3795,8 @@ func (m *awsRestjson1_serializeOpRestartSimulationJob) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/restartSimulationJob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4113,13 +3863,8 @@ func (m *awsRestjson1_serializeOpStartSimulationJobBatch) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/startSimulationJobBatch") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4207,13 +3952,8 @@ func (m *awsRestjson1_serializeOpSyncDeploymentJob) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/syncDeploymentJob") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4285,13 +4025,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4373,13 +4108,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4442,13 +4172,8 @@ func (m *awsRestjson1_serializeOpUpdateRobotApplication) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/updateRobotApplication") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4534,13 +4259,8 @@ func (m *awsRestjson1_serializeOpUpdateSimulationApplication) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/updateSimulationApplication") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4640,13 +4360,8 @@ func (m *awsRestjson1_serializeOpUpdateWorldTemplate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/updateWorldTemplate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/route53/go.mod b/service/route53/go.mod index 1022e810993..37d84839d50 100644 --- a/service/route53/go.mod +++ b/service/route53/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/route53/go.sum b/service/route53/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/route53/go.sum +++ b/service/route53/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/route53/serializers.go b/service/route53/serializers.go index 84d0e6eb31d..ae93fa71a11 100644 --- a/service/route53/serializers.go +++ b/service/route53/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestxml_serializeOpActivateKeySigningKey) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/keysigningkey/{HostedZoneId}/{Name}/activate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -108,13 +103,8 @@ func (m *awsRestxml_serializeOpAssociateVPCWithHostedZone) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzone/{HostedZoneId}/associatevpc") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -218,13 +208,8 @@ func (m *awsRestxml_serializeOpChangeResourceRecordSets) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzone/{HostedZoneId}/rrset") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -317,13 +302,8 @@ func (m *awsRestxml_serializeOpChangeTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/tags/{ResourceType}/{ResourceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -438,13 +418,8 @@ func (m *awsRestxml_serializeOpCreateHealthCheck) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/healthcheck") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -535,13 +510,8 @@ func (m *awsRestxml_serializeOpCreateHostedZone) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzone") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -667,13 +637,8 @@ func (m *awsRestxml_serializeOpCreateKeySigningKey) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/keysigningkey") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -795,13 +760,8 @@ func (m *awsRestxml_serializeOpCreateQueryLoggingConfig) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/queryloggingconfig") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -890,13 +850,8 @@ func (m *awsRestxml_serializeOpCreateReusableDelegationSet) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/delegationset") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -985,13 +940,8 @@ func (m *awsRestxml_serializeOpCreateTrafficPolicy) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/trafficpolicy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1091,13 +1041,8 @@ func (m *awsRestxml_serializeOpCreateTrafficPolicyInstance) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/trafficpolicyinstance") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1219,13 +1164,8 @@ func (m *awsRestxml_serializeOpCreateTrafficPolicyVersion) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/trafficpolicy/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1327,13 +1267,8 @@ func (m *awsRestxml_serializeOpCreateVPCAssociationAuthorization) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzone/{HostedZoneId}/authorizevpcassociation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1426,13 +1361,8 @@ func (m *awsRestxml_serializeOpDeactivateKeySigningKey) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/keysigningkey/{HostedZoneId}/{Name}/deactivate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1498,13 +1428,8 @@ func (m *awsRestxml_serializeOpDeleteHealthCheck) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/healthcheck/{HealthCheckId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1561,13 +1486,8 @@ func (m *awsRestxml_serializeOpDeleteHostedZone) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzone/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1624,13 +1544,8 @@ func (m *awsRestxml_serializeOpDeleteKeySigningKey) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/keysigningkey/{HostedZoneId}/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1696,13 +1611,8 @@ func (m *awsRestxml_serializeOpDeleteQueryLoggingConfig) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/queryloggingconfig/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1759,13 +1669,8 @@ func (m *awsRestxml_serializeOpDeleteReusableDelegationSet) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/delegationset/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1822,13 +1727,8 @@ func (m *awsRestxml_serializeOpDeleteTrafficPolicy) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/trafficpolicy/{Id}/{Version}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1894,13 +1794,8 @@ func (m *awsRestxml_serializeOpDeleteTrafficPolicyInstance) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/trafficpolicyinstance/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1957,13 +1852,8 @@ func (m *awsRestxml_serializeOpDeleteVPCAssociationAuthorization) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzone/{HostedZoneId}/deauthorizevpcassociation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2056,13 +1946,8 @@ func (m *awsRestxml_serializeOpDisableHostedZoneDNSSEC) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzone/{HostedZoneId}/disable-dnssec") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2119,13 +2004,8 @@ func (m *awsRestxml_serializeOpDisassociateVPCFromHostedZone) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzone/{HostedZoneId}/disassociatevpc") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2229,13 +2109,8 @@ func (m *awsRestxml_serializeOpEnableHostedZoneDNSSEC) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzone/{HostedZoneId}/enable-dnssec") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2292,13 +2167,8 @@ func (m *awsRestxml_serializeOpGetAccountLimit) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/accountlimit/{Type}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2355,13 +2225,8 @@ func (m *awsRestxml_serializeOpGetChange) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/change/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2418,13 +2283,8 @@ func (m *awsRestxml_serializeOpGetCheckerIpRanges) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/checkeripranges") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2468,13 +2328,8 @@ func (m *awsRestxml_serializeOpGetDNSSEC) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzone/{HostedZoneId}/dnssec") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2531,13 +2386,8 @@ func (m *awsRestxml_serializeOpGetGeoLocation) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/geolocation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2597,13 +2447,8 @@ func (m *awsRestxml_serializeOpGetHealthCheck) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/healthcheck/{HealthCheckId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2660,13 +2505,8 @@ func (m *awsRestxml_serializeOpGetHealthCheckCount) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/healthcheckcount") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2710,13 +2550,8 @@ func (m *awsRestxml_serializeOpGetHealthCheckLastFailureReason) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/healthcheck/{HealthCheckId}/lastfailurereason") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2773,13 +2608,8 @@ func (m *awsRestxml_serializeOpGetHealthCheckStatus) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/healthcheck/{HealthCheckId}/status") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2836,13 +2666,8 @@ func (m *awsRestxml_serializeOpGetHostedZone) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzone/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2899,13 +2724,8 @@ func (m *awsRestxml_serializeOpGetHostedZoneCount) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzonecount") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2949,13 +2769,8 @@ func (m *awsRestxml_serializeOpGetHostedZoneLimit) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzonelimit/{HostedZoneId}/{Type}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3021,13 +2836,8 @@ func (m *awsRestxml_serializeOpGetQueryLoggingConfig) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/queryloggingconfig/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3084,13 +2894,8 @@ func (m *awsRestxml_serializeOpGetReusableDelegationSet) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/delegationset/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3147,13 +2952,8 @@ func (m *awsRestxml_serializeOpGetReusableDelegationSetLimit) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/reusabledelegationsetlimit/{DelegationSetId}/{Type}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3219,13 +3019,8 @@ func (m *awsRestxml_serializeOpGetTrafficPolicy) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/trafficpolicy/{Id}/{Version}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3291,13 +3086,8 @@ func (m *awsRestxml_serializeOpGetTrafficPolicyInstance) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/trafficpolicyinstance/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3354,13 +3144,8 @@ func (m *awsRestxml_serializeOpGetTrafficPolicyInstanceCount) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/trafficpolicyinstancecount") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3404,13 +3189,8 @@ func (m *awsRestxml_serializeOpListGeoLocations) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/geolocations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3474,13 +3254,8 @@ func (m *awsRestxml_serializeOpListHealthChecks) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/healthcheck") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3536,13 +3311,8 @@ func (m *awsRestxml_serializeOpListHostedZones) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzone") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3602,13 +3372,8 @@ func (m *awsRestxml_serializeOpListHostedZonesByName) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzonesbyname") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3668,13 +3433,8 @@ func (m *awsRestxml_serializeOpListHostedZonesByVPC) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzonesbyvpc") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3738,13 +3498,8 @@ func (m *awsRestxml_serializeOpListQueryLoggingConfigs) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/queryloggingconfig") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3804,13 +3559,8 @@ func (m *awsRestxml_serializeOpListResourceRecordSets) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzone/{HostedZoneId}/rrset") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3883,13 +3633,8 @@ func (m *awsRestxml_serializeOpListReusableDelegationSets) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/delegationset") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3945,13 +3690,8 @@ func (m *awsRestxml_serializeOpListTagsForResource) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/tags/{ResourceType}/{ResourceId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4017,13 +3757,8 @@ func (m *awsRestxml_serializeOpListTagsForResources) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/tags/{ResourceType}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4116,13 +3851,8 @@ func (m *awsRestxml_serializeOpListTrafficPolicies) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/trafficpolicies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4178,13 +3908,8 @@ func (m *awsRestxml_serializeOpListTrafficPolicyInstances) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/trafficpolicyinstances") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4248,13 +3973,8 @@ func (m *awsRestxml_serializeOpListTrafficPolicyInstancesByHostedZone) HandleSer } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/trafficpolicyinstances/hostedzone") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4318,13 +4038,8 @@ func (m *awsRestxml_serializeOpListTrafficPolicyInstancesByPolicy) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/trafficpolicyinstances/trafficpolicy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4396,13 +4111,8 @@ func (m *awsRestxml_serializeOpListTrafficPolicyVersions) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/trafficpolicies/{Id}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4467,13 +4177,8 @@ func (m *awsRestxml_serializeOpListVPCAssociationAuthorizations) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzone/{HostedZoneId}/authorizevpcassociation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4538,13 +4243,8 @@ func (m *awsRestxml_serializeOpTestDNSAnswer) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/testdnsanswer") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4616,13 +4316,8 @@ func (m *awsRestxml_serializeOpUpdateHealthCheck) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/healthcheck/{HealthCheckId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4886,13 +4581,8 @@ func (m *awsRestxml_serializeOpUpdateHostedZoneComment) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/hostedzone/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4983,13 +4673,8 @@ func (m *awsRestxml_serializeOpUpdateTrafficPolicyComment) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/trafficpolicy/{Id}/{Version}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5089,13 +4774,8 @@ func (m *awsRestxml_serializeOpUpdateTrafficPolicyInstance) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/2013-04-01/trafficpolicyinstance/{Id}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/s3/go.mod b/service/s3/go.mod index e10b1e2a62b..e849a91c595 100644 --- a/service/s3/go.mod +++ b/service/s3/go.mod @@ -7,7 +7,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.0.2 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.4 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a github.com/google/go-cmp v0.5.4 ) diff --git a/service/s3/go.sum b/service/s3/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/s3/go.sum +++ b/service/s3/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/s3/internal/configtesting/go.mod b/service/s3/internal/configtesting/go.mod index cdd6cf5b58d..a440db8f8ac 100644 --- a/service/s3/internal/configtesting/go.mod +++ b/service/s3/internal/configtesting/go.mod @@ -5,12 +5,6 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2/config v1.1.3 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.0 - github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/aws-sdk-go-v2/service/sts v1.2.0 - github.com/aws/aws-sdk-go-v2/credentials v1.1.3 - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.4 - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.4 - github.com/aws/aws-sdk-go-v2/service/sso v1.1.3 ) replace ( diff --git a/service/s3/internal/configtesting/go.sum b/service/s3/internal/configtesting/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/s3/internal/configtesting/go.sum +++ b/service/s3/internal/configtesting/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/s3/serializers.go b/service/s3/serializers.go index bebd064538b..3f96a51c8a4 100644 --- a/service/s3/serializers.go +++ b/service/s3/serializers.go @@ -39,13 +39,8 @@ func (m *awsRestxml_serializeOpAbortMultipartUpload) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?x-id=AbortMultipartUpload") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -125,13 +120,8 @@ func (m *awsRestxml_serializeOpCompleteMultipartUpload) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?x-id=CompleteMultipartUpload") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -234,13 +224,8 @@ func (m *awsRestxml_serializeOpCopyObject) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?x-id=CopyObject") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -500,13 +485,8 @@ func (m *awsRestxml_serializeOpCreateBucket) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/{Bucket}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -621,13 +601,8 @@ func (m *awsRestxml_serializeOpCreateMultipartUpload) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?uploads&x-id=CreateMultipartUpload") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -832,13 +807,8 @@ func (m *awsRestxml_serializeOpDeleteBucket) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/{Bucket}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -900,13 +870,8 @@ func (m *awsRestxml_serializeOpDeleteBucketAnalyticsConfiguration) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?analytics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -972,13 +937,8 @@ func (m *awsRestxml_serializeOpDeleteBucketCors) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?cors") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1040,13 +1000,8 @@ func (m *awsRestxml_serializeOpDeleteBucketEncryption) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?encryption") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1108,13 +1063,8 @@ func (m *awsRestxml_serializeOpDeleteBucketIntelligentTieringConfiguration) Hand } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?intelligent-tiering") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1175,13 +1125,8 @@ func (m *awsRestxml_serializeOpDeleteBucketInventoryConfiguration) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?inventory") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1247,13 +1192,8 @@ func (m *awsRestxml_serializeOpDeleteBucketLifecycle) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?lifecycle") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1315,13 +1255,8 @@ func (m *awsRestxml_serializeOpDeleteBucketMetricsConfiguration) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?metrics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1387,13 +1322,8 @@ func (m *awsRestxml_serializeOpDeleteBucketOwnershipControls) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?ownershipControls") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1455,13 +1385,8 @@ func (m *awsRestxml_serializeOpDeleteBucketPolicy) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1523,13 +1448,8 @@ func (m *awsRestxml_serializeOpDeleteBucketReplication) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?replication") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1591,13 +1511,8 @@ func (m *awsRestxml_serializeOpDeleteBucketTagging) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1659,13 +1574,8 @@ func (m *awsRestxml_serializeOpDeleteBucketWebsite) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?website") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1727,13 +1637,8 @@ func (m *awsRestxml_serializeOpDeleteObject) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?x-id=DeleteObject") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1823,13 +1728,8 @@ func (m *awsRestxml_serializeOpDeleteObjects) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?delete&x-id=DeleteObjects") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1929,13 +1829,8 @@ func (m *awsRestxml_serializeOpDeleteObjectTagging) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2010,13 +1905,8 @@ func (m *awsRestxml_serializeOpDeletePublicAccessBlock) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?publicAccessBlock") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2078,13 +1968,8 @@ func (m *awsRestxml_serializeOpGetBucketAccelerateConfiguration) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?accelerate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2146,13 +2031,8 @@ func (m *awsRestxml_serializeOpGetBucketAcl) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?acl") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2214,13 +2094,8 @@ func (m *awsRestxml_serializeOpGetBucketAnalyticsConfiguration) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?analytics&x-id=GetBucketAnalyticsConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2286,13 +2161,8 @@ func (m *awsRestxml_serializeOpGetBucketCors) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?cors") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2354,13 +2224,8 @@ func (m *awsRestxml_serializeOpGetBucketEncryption) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?encryption") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2422,13 +2287,8 @@ func (m *awsRestxml_serializeOpGetBucketIntelligentTieringConfiguration) HandleS } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?intelligent-tiering&x-id=GetBucketIntelligentTieringConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2489,13 +2349,8 @@ func (m *awsRestxml_serializeOpGetBucketInventoryConfiguration) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?inventory&x-id=GetBucketInventoryConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2561,13 +2416,8 @@ func (m *awsRestxml_serializeOpGetBucketLifecycleConfiguration) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?lifecycle") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2629,13 +2479,8 @@ func (m *awsRestxml_serializeOpGetBucketLocation) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?location") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2697,13 +2542,8 @@ func (m *awsRestxml_serializeOpGetBucketLogging) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?logging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2765,13 +2605,8 @@ func (m *awsRestxml_serializeOpGetBucketMetricsConfiguration) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?metrics&x-id=GetBucketMetricsConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2837,13 +2672,8 @@ func (m *awsRestxml_serializeOpGetBucketNotificationConfiguration) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?notification") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2905,13 +2735,8 @@ func (m *awsRestxml_serializeOpGetBucketOwnershipControls) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?ownershipControls") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2973,13 +2798,8 @@ func (m *awsRestxml_serializeOpGetBucketPolicy) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3041,13 +2861,8 @@ func (m *awsRestxml_serializeOpGetBucketPolicyStatus) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?policyStatus") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3109,13 +2924,8 @@ func (m *awsRestxml_serializeOpGetBucketReplication) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?replication") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3177,13 +2987,8 @@ func (m *awsRestxml_serializeOpGetBucketRequestPayment) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?requestPayment") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3245,13 +3050,8 @@ func (m *awsRestxml_serializeOpGetBucketTagging) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3313,13 +3113,8 @@ func (m *awsRestxml_serializeOpGetBucketVersioning) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?versioning") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3381,13 +3176,8 @@ func (m *awsRestxml_serializeOpGetBucketWebsite) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?website") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3449,13 +3239,8 @@ func (m *awsRestxml_serializeOpGetObject) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?x-id=GetObject") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3603,13 +3388,8 @@ func (m *awsRestxml_serializeOpGetObjectAcl) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?acl") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3689,13 +3469,8 @@ func (m *awsRestxml_serializeOpGetObjectLegalHold) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?legal-hold") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3775,13 +3550,8 @@ func (m *awsRestxml_serializeOpGetObjectLockConfiguration) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?object-lock") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3843,13 +3613,8 @@ func (m *awsRestxml_serializeOpGetObjectRetention) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?retention") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3929,13 +3694,8 @@ func (m *awsRestxml_serializeOpGetObjectTagging) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4015,13 +3775,8 @@ func (m *awsRestxml_serializeOpGetObjectTorrent) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?torrent") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4097,13 +3852,8 @@ func (m *awsRestxml_serializeOpGetPublicAccessBlock) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?publicAccessBlock") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4165,13 +3915,8 @@ func (m *awsRestxml_serializeOpHeadBucket) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/{Bucket}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "HEAD" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4233,13 +3978,8 @@ func (m *awsRestxml_serializeOpHeadObject) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "HEAD" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4363,13 +4103,8 @@ func (m *awsRestxml_serializeOpListBucketAnalyticsConfigurations) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?analytics&x-id=ListBucketAnalyticsConfigurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4435,13 +4170,8 @@ func (m *awsRestxml_serializeOpListBucketIntelligentTieringConfigurations) Handl } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?intelligent-tiering&x-id=ListBucketIntelligentTieringConfigurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4502,13 +4232,8 @@ func (m *awsRestxml_serializeOpListBucketInventoryConfigurations) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?inventory&x-id=ListBucketInventoryConfigurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4574,13 +4299,8 @@ func (m *awsRestxml_serializeOpListBucketMetricsConfigurations) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?metrics&x-id=ListBucketMetricsConfigurations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4646,13 +4366,8 @@ func (m *awsRestxml_serializeOpListBuckets) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4696,13 +4411,8 @@ func (m *awsRestxml_serializeOpListMultipartUploads) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?uploads") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4788,13 +4498,8 @@ func (m *awsRestxml_serializeOpListObjects) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/{Bucket}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4881,13 +4586,8 @@ func (m *awsRestxml_serializeOpListObjectsV2) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?list-type=2") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4982,13 +4682,8 @@ func (m *awsRestxml_serializeOpListObjectVersions) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5074,13 +4769,8 @@ func (m *awsRestxml_serializeOpListParts) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?x-id=ListParts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5168,13 +4858,8 @@ func (m *awsRestxml_serializeOpPutBucketAccelerateConfiguration) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?accelerate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5259,13 +4944,8 @@ func (m *awsRestxml_serializeOpPutBucketAcl) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?acl") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5385,13 +5065,8 @@ func (m *awsRestxml_serializeOpPutBucketAnalyticsConfiguration) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?analytics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5480,13 +5155,8 @@ func (m *awsRestxml_serializeOpPutBucketCors) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?cors") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5576,13 +5246,8 @@ func (m *awsRestxml_serializeOpPutBucketEncryption) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?encryption") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5672,13 +5337,8 @@ func (m *awsRestxml_serializeOpPutBucketIntelligentTieringConfiguration) HandleS } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?intelligent-tiering") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5762,13 +5422,8 @@ func (m *awsRestxml_serializeOpPutBucketInventoryConfiguration) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?inventory") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5857,13 +5512,8 @@ func (m *awsRestxml_serializeOpPutBucketLifecycleConfiguration) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?lifecycle") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5948,13 +5598,8 @@ func (m *awsRestxml_serializeOpPutBucketLogging) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?logging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6044,13 +5689,8 @@ func (m *awsRestxml_serializeOpPutBucketMetricsConfiguration) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?metrics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6139,13 +5779,8 @@ func (m *awsRestxml_serializeOpPutBucketNotificationConfiguration) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?notification") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6230,13 +5865,8 @@ func (m *awsRestxml_serializeOpPutBucketOwnershipControls) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?ownershipControls") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6326,13 +5956,8 @@ func (m *awsRestxml_serializeOpPutBucketPolicy) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6415,13 +6040,8 @@ func (m *awsRestxml_serializeOpPutBucketReplication) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?replication") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6516,13 +6136,8 @@ func (m *awsRestxml_serializeOpPutBucketRequestPayment) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?requestPayment") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6612,13 +6227,8 @@ func (m *awsRestxml_serializeOpPutBucketTagging) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6708,13 +6318,8 @@ func (m *awsRestxml_serializeOpPutBucketVersioning) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?versioning") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6809,13 +6414,8 @@ func (m *awsRestxml_serializeOpPutBucketWebsite) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?website") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6905,13 +6505,8 @@ func (m *awsRestxml_serializeOpPutObject) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?x-id=PutObject") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7137,13 +6732,8 @@ func (m *awsRestxml_serializeOpPutObjectAcl) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?acl") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7281,13 +6871,8 @@ func (m *awsRestxml_serializeOpPutObjectLegalHold) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?legal-hold") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7395,13 +6980,8 @@ func (m *awsRestxml_serializeOpPutObjectLockConfiguration) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?object-lock") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7501,13 +7081,8 @@ func (m *awsRestxml_serializeOpPutObjectRetention) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?retention") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7620,13 +7195,8 @@ func (m *awsRestxml_serializeOpPutObjectTagging) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7734,13 +7304,8 @@ func (m *awsRestxml_serializeOpPutPublicAccessBlock) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/{Bucket}?publicAccessBlock") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7830,13 +7395,8 @@ func (m *awsRestxml_serializeOpRestoreObject) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?restore&x-id=RestoreObject") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -7939,13 +7499,8 @@ func (m *awsRestxml_serializeOpUploadPart) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?x-id=UploadPart") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8065,13 +7620,8 @@ func (m *awsRestxml_serializeOpUploadPartCopy) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/{Bucket}/{Key+}?x-id=UploadPartCopy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -8220,13 +7770,8 @@ func (m *awsRestxml_serializeOpWriteGetObjectResponse) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/WriteGetObjectResponse?x-id=WriteGetObjectResponse") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/s3control/go.mod b/service/s3control/go.mod index a4bcc38f8d4..8d1732d8c34 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 v1.3.0 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.2.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/s3control/go.sum b/service/s3control/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/s3control/go.sum +++ b/service/s3control/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/s3control/serializers.go b/service/s3control/serializers.go index d0c5d5b1f4a..95a5fa30cd9 100644 --- a/service/s3control/serializers.go +++ b/service/s3control/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestxml_serializeOpCreateAccessPoint) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspoint/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -165,13 +160,8 @@ func (m *awsRestxml_serializeOpCreateAccessPointForObjectLambda) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspointforobjectlambda/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -269,13 +259,8 @@ func (m *awsRestxml_serializeOpCreateBucket) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v20180820/bucket/{Bucket}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -395,13 +380,8 @@ func (m *awsRestxml_serializeOpCreateJob) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/v20180820/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -584,13 +564,8 @@ func (m *awsRestxml_serializeOpDeleteAccessPoint) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspoint/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -652,13 +627,8 @@ func (m *awsRestxml_serializeOpDeleteAccessPointForObjectLambda) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspointforobjectlambda/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -720,13 +690,8 @@ func (m *awsRestxml_serializeOpDeleteAccessPointPolicy) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspoint/{Name}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -788,13 +753,8 @@ func (m *awsRestxml_serializeOpDeleteAccessPointPolicyForObjectLambda) HandleSer } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspointforobjectlambda/{Name}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -856,13 +816,8 @@ func (m *awsRestxml_serializeOpDeleteBucket) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v20180820/bucket/{Bucket}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -924,13 +879,8 @@ func (m *awsRestxml_serializeOpDeleteBucketLifecycleConfiguration) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/v20180820/bucket/{Bucket}/lifecycleconfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -992,13 +942,8 @@ func (m *awsRestxml_serializeOpDeleteBucketPolicy) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v20180820/bucket/{Bucket}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1060,13 +1005,8 @@ func (m *awsRestxml_serializeOpDeleteBucketTagging) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v20180820/bucket/{Bucket}/tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1128,13 +1068,8 @@ func (m *awsRestxml_serializeOpDeleteJobTagging) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v20180820/jobs/{JobId}/tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1196,13 +1131,8 @@ func (m *awsRestxml_serializeOpDeletePublicAccessBlock) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v20180820/configuration/publicAccessBlock") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1255,13 +1185,8 @@ func (m *awsRestxml_serializeOpDeleteStorageLensConfiguration) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/v20180820/storagelens/{ConfigId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1323,13 +1248,8 @@ func (m *awsRestxml_serializeOpDeleteStorageLensConfigurationTagging) HandleSeri } opPath, opQuery := httpbinding.SplitURI("/v20180820/storagelens/{ConfigId}/tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1391,13 +1311,8 @@ func (m *awsRestxml_serializeOpDescribeJob) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v20180820/jobs/{JobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1459,13 +1374,8 @@ func (m *awsRestxml_serializeOpGetAccessPoint) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspoint/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1527,13 +1437,8 @@ func (m *awsRestxml_serializeOpGetAccessPointConfigurationForObjectLambda) Handl } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspointforobjectlambda/{Name}/configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1595,13 +1500,8 @@ func (m *awsRestxml_serializeOpGetAccessPointForObjectLambda) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspointforobjectlambda/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1663,13 +1563,8 @@ func (m *awsRestxml_serializeOpGetAccessPointPolicy) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspoint/{Name}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1731,13 +1626,8 @@ func (m *awsRestxml_serializeOpGetAccessPointPolicyForObjectLambda) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspointforobjectlambda/{Name}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1799,13 +1689,8 @@ func (m *awsRestxml_serializeOpGetAccessPointPolicyStatus) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspoint/{Name}/policyStatus") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1867,13 +1752,8 @@ func (m *awsRestxml_serializeOpGetAccessPointPolicyStatusForObjectLambda) Handle } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspointforobjectlambda/{Name}/policyStatus") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1935,13 +1815,8 @@ func (m *awsRestxml_serializeOpGetBucket) HandleSerialize(ctx context.Context, i } opPath, opQuery := httpbinding.SplitURI("/v20180820/bucket/{Bucket}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2003,13 +1878,8 @@ func (m *awsRestxml_serializeOpGetBucketLifecycleConfiguration) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/v20180820/bucket/{Bucket}/lifecycleconfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2071,13 +1941,8 @@ func (m *awsRestxml_serializeOpGetBucketPolicy) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v20180820/bucket/{Bucket}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2139,13 +2004,8 @@ func (m *awsRestxml_serializeOpGetBucketTagging) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v20180820/bucket/{Bucket}/tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2207,13 +2067,8 @@ func (m *awsRestxml_serializeOpGetJobTagging) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v20180820/jobs/{JobId}/tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2275,13 +2130,8 @@ func (m *awsRestxml_serializeOpGetPublicAccessBlock) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v20180820/configuration/publicAccessBlock") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2334,13 +2184,8 @@ func (m *awsRestxml_serializeOpGetStorageLensConfiguration) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v20180820/storagelens/{ConfigId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2402,13 +2247,8 @@ func (m *awsRestxml_serializeOpGetStorageLensConfigurationTagging) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/v20180820/storagelens/{ConfigId}/tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2470,13 +2310,8 @@ func (m *awsRestxml_serializeOpListAccessPoints) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspoint") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2541,13 +2376,8 @@ func (m *awsRestxml_serializeOpListAccessPointsForObjectLambda) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspointforobjectlambda") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2608,13 +2438,8 @@ func (m *awsRestxml_serializeOpListJobs) HandleSerialize(ctx context.Context, in } opPath, opQuery := httpbinding.SplitURI("/v20180820/jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2681,13 +2506,8 @@ func (m *awsRestxml_serializeOpListRegionalBuckets) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v20180820/bucket") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2753,13 +2573,8 @@ func (m *awsRestxml_serializeOpListStorageLensConfigurations) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/v20180820/storagelens") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2816,13 +2631,8 @@ func (m *awsRestxml_serializeOpPutAccessPointConfigurationForObjectLambda) Handl } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspointforobjectlambda/{Name}/configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2920,13 +2730,8 @@ func (m *awsRestxml_serializeOpPutAccessPointPolicy) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspoint/{Name}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3022,13 +2827,8 @@ func (m *awsRestxml_serializeOpPutAccessPointPolicyForObjectLambda) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/v20180820/accesspointforobjectlambda/{Name}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3124,13 +2924,8 @@ func (m *awsRestxml_serializeOpPutBucketLifecycleConfiguration) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/v20180820/bucket/{Bucket}/lifecycleconfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3215,13 +3010,8 @@ func (m *awsRestxml_serializeOpPutBucketPolicy) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v20180820/bucket/{Bucket}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3322,13 +3112,8 @@ func (m *awsRestxml_serializeOpPutBucketTagging) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v20180820/bucket/{Bucket}/tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3413,13 +3198,8 @@ func (m *awsRestxml_serializeOpPutJobTagging) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v20180820/jobs/{JobId}/tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3517,13 +3297,8 @@ func (m *awsRestxml_serializeOpPutPublicAccessBlock) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v20180820/configuration/publicAccessBlock") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3599,13 +3374,8 @@ func (m *awsRestxml_serializeOpPutStorageLensConfiguration) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v20180820/storagelens/{ConfigId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3716,13 +3486,8 @@ func (m *awsRestxml_serializeOpPutStorageLensConfigurationTagging) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/v20180820/storagelens/{ConfigId}/tagging") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3820,13 +3585,8 @@ func (m *awsRestxml_serializeOpUpdateJobPriority) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v20180820/jobs/{JobId}/priority") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3892,13 +3652,8 @@ func (m *awsRestxml_serializeOpUpdateJobStatus) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v20180820/jobs/{JobId}/status") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/s3outposts/go.mod b/service/s3outposts/go.mod index 361b54a4df2..07fa3d1eb72 100644 --- a/service/s3outposts/go.mod +++ b/service/s3outposts/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/s3outposts/go.sum b/service/s3outposts/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/s3outposts/go.sum +++ b/service/s3outposts/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/s3outposts/serializers.go b/service/s3outposts/serializers.go index 9448b1b267d..6fd9f8bdd3e 100644 --- a/service/s3outposts/serializers.go +++ b/service/s3outposts/serializers.go @@ -35,13 +35,8 @@ func (m *awsRestjson1_serializeOpCreateEndpoint) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/S3Outposts/CreateEndpoint") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -118,13 +113,8 @@ func (m *awsRestjson1_serializeOpDeleteEndpoint) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/S3Outposts/DeleteEndpoint") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -180,13 +170,8 @@ func (m *awsRestjson1_serializeOpListEndpoints) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/S3Outposts/ListEndpoints") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/sagemakera2iruntime/go.mod b/service/sagemakera2iruntime/go.mod index be9651e432c..b2267ceb2e8 100644 --- a/service/sagemakera2iruntime/go.mod +++ b/service/sagemakera2iruntime/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sagemakera2iruntime/go.sum b/service/sagemakera2iruntime/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/sagemakera2iruntime/go.sum +++ b/service/sagemakera2iruntime/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sagemakera2iruntime/serializers.go b/service/sagemakera2iruntime/serializers.go index a577fab95a0..3e92a399645 100644 --- a/service/sagemakera2iruntime/serializers.go +++ b/service/sagemakera2iruntime/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpDeleteHumanLoop) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/human-loops/{HumanLoopName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -100,13 +95,8 @@ func (m *awsRestjson1_serializeOpDescribeHumanLoop) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/human-loops/{HumanLoopName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -163,13 +153,8 @@ func (m *awsRestjson1_serializeOpListHumanLoops) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/human-loops") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -241,13 +226,8 @@ func (m *awsRestjson1_serializeOpStartHumanLoop) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/human-loops") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -333,13 +313,8 @@ func (m *awsRestjson1_serializeOpStopHumanLoop) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/human-loops/stop") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/sagemakeredge/go.mod b/service/sagemakeredge/go.mod index 6e130a33984..f2b2531d45e 100644 --- a/service/sagemakeredge/go.mod +++ b/service/sagemakeredge/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sagemakeredge/go.sum b/service/sagemakeredge/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/sagemakeredge/go.sum +++ b/service/sagemakeredge/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sagemakeredge/serializers.go b/service/sagemakeredge/serializers.go index f059be9293d..3bab8fdcde6 100644 --- a/service/sagemakeredge/serializers.go +++ b/service/sagemakeredge/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpGetDeviceRegistration) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/GetDeviceRegistration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -115,13 +110,8 @@ func (m *awsRestjson1_serializeOpSendHeartbeat) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/SendHeartbeat") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/sagemakerfeaturestoreruntime/go.mod b/service/sagemakerfeaturestoreruntime/go.mod index 73a1f691ee3..cb8c9b78fc7 100644 --- a/service/sagemakerfeaturestoreruntime/go.mod +++ b/service/sagemakerfeaturestoreruntime/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sagemakerfeaturestoreruntime/go.sum b/service/sagemakerfeaturestoreruntime/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/sagemakerfeaturestoreruntime/go.sum +++ b/service/sagemakerfeaturestoreruntime/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sagemakerfeaturestoreruntime/serializers.go b/service/sagemakerfeaturestoreruntime/serializers.go index 041aad45a9d..0fa7d9672c2 100644 --- a/service/sagemakerfeaturestoreruntime/serializers.go +++ b/service/sagemakerfeaturestoreruntime/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpDeleteRecord) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/FeatureGroup/{FeatureGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -107,13 +102,8 @@ func (m *awsRestjson1_serializeOpGetRecord) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/FeatureGroup/{FeatureGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -180,13 +170,8 @@ func (m *awsRestjson1_serializeOpPutRecord) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/FeatureGroup/{FeatureGroupName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/sagemakerruntime/go.mod b/service/sagemakerruntime/go.mod index 8bcd9128539..1692e0496b7 100644 --- a/service/sagemakerruntime/go.mod +++ b/service/sagemakerruntime/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sagemakerruntime/go.sum b/service/sagemakerruntime/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/sagemakerruntime/go.sum +++ b/service/sagemakerruntime/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sagemakerruntime/serializers.go b/service/sagemakerruntime/serializers.go index 51163d435cf..98309d08a90 100644 --- a/service/sagemakerruntime/serializers.go +++ b/service/sagemakerruntime/serializers.go @@ -34,13 +34,8 @@ func (m *awsRestjson1_serializeOpInvokeEndpoint) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/endpoints/{EndpointName}/invocations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/savingsplans/go.mod b/service/savingsplans/go.mod index c5b41695e9e..ce78e626e2b 100644 --- a/service/savingsplans/go.mod +++ b/service/savingsplans/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/savingsplans/go.sum b/service/savingsplans/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/savingsplans/go.sum +++ b/service/savingsplans/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/savingsplans/serializers.go b/service/savingsplans/serializers.go index 535a8080258..ab11bf187ad 100644 --- a/service/savingsplans/serializers.go +++ b/service/savingsplans/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpCreateSavingsPlan) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/CreateSavingsPlan") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -137,13 +132,8 @@ func (m *awsRestjson1_serializeOpDeleteQueuedSavingsPlan) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/DeleteQueuedSavingsPlan") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -210,13 +200,8 @@ func (m *awsRestjson1_serializeOpDescribeSavingsPlanRates) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/DescribeSavingsPlanRates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -300,13 +285,8 @@ func (m *awsRestjson1_serializeOpDescribeSavingsPlans) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/DescribeSavingsPlans") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -406,13 +386,8 @@ func (m *awsRestjson1_serializeOpDescribeSavingsPlansOfferingRates) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/DescribeSavingsPlansOfferingRates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -540,13 +515,8 @@ func (m *awsRestjson1_serializeOpDescribeSavingsPlansOfferings) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/DescribeSavingsPlansOfferings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -693,13 +663,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/ListTagsForResource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -766,13 +731,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/TagResource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -846,13 +806,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/UntagResource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/schemas/go.mod b/service/schemas/go.mod index 088fc4441d7..f27d39c93ee 100644 --- a/service/schemas/go.mod +++ b/service/schemas/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/schemas/go.sum b/service/schemas/go.sum index d937214c3eb..9ddcad9aa66 100644 --- a/service/schemas/go.sum +++ b/service/schemas/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= 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.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= diff --git a/service/schemas/serializers.go b/service/schemas/serializers.go index a9afca6298e..a24fe6af95b 100644 --- a/service/schemas/serializers.go +++ b/service/schemas/serializers.go @@ -35,13 +35,8 @@ func (m *awsRestjson1_serializeOpCreateDiscoverer) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/discoverers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -120,13 +115,8 @@ func (m *awsRestjson1_serializeOpCreateRegistry) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -213,13 +203,8 @@ func (m *awsRestjson1_serializeOpCreateSchema) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}/schemas/name/{SchemaName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -325,13 +310,8 @@ func (m *awsRestjson1_serializeOpDeleteDiscoverer) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/discoverers/id/{DiscovererId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -388,13 +368,8 @@ func (m *awsRestjson1_serializeOpDeleteRegistry) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -451,13 +426,8 @@ func (m *awsRestjson1_serializeOpDeleteResourcePolicy) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v1/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -509,13 +479,8 @@ func (m *awsRestjson1_serializeOpDeleteSchema) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}/schemas/name/{SchemaName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -581,13 +546,8 @@ func (m *awsRestjson1_serializeOpDeleteSchemaVersion) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}/schemas/name/{SchemaName}/version/{SchemaVersion}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -662,13 +622,8 @@ func (m *awsRestjson1_serializeOpDescribeCodeBinding) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}/schemas/name/{SchemaName}/language/{Language}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -747,13 +702,8 @@ func (m *awsRestjson1_serializeOpDescribeDiscoverer) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/discoverers/id/{DiscovererId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -810,13 +760,8 @@ func (m *awsRestjson1_serializeOpDescribeRegistry) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -873,13 +818,8 @@ func (m *awsRestjson1_serializeOpDescribeSchema) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}/schemas/name/{SchemaName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -949,13 +889,8 @@ func (m *awsRestjson1_serializeOpExportSchema) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}/schemas/name/{SchemaName}/export") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1029,13 +964,8 @@ func (m *awsRestjson1_serializeOpGetCodeBindingSource) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}/schemas/name/{SchemaName}/language/{Language}/source") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1114,13 +1044,8 @@ func (m *awsRestjson1_serializeOpGetDiscoveredSchema) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v1/discover") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1194,13 +1119,8 @@ func (m *awsRestjson1_serializeOpGetResourcePolicy) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v1/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1252,13 +1172,8 @@ func (m *awsRestjson1_serializeOpListDiscoverers) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v1/discoverers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1322,13 +1237,8 @@ func (m *awsRestjson1_serializeOpListRegistries) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/registries") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1392,13 +1302,8 @@ func (m *awsRestjson1_serializeOpListSchemas) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}/schemas") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1467,13 +1372,8 @@ func (m *awsRestjson1_serializeOpListSchemaVersions) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}/schemas/name/{SchemaName}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1547,13 +1447,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1610,13 +1505,8 @@ func (m *awsRestjson1_serializeOpPutCodeBinding) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}/schemas/name/{SchemaName}/language/{Language}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1695,13 +1585,8 @@ func (m *awsRestjson1_serializeOpPutResourcePolicy) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v1/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1781,13 +1666,8 @@ func (m *awsRestjson1_serializeOpSearchSchemas) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}/schemas/search") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1856,13 +1736,8 @@ func (m *awsRestjson1_serializeOpStartDiscoverer) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v1/discoverers/id/{DiscovererId}/start") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1919,13 +1794,8 @@ func (m *awsRestjson1_serializeOpStopDiscoverer) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/discoverers/id/{DiscovererId}/stop") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1982,13 +1852,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2070,13 +1935,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2139,13 +1999,8 @@ func (m *awsRestjson1_serializeOpUpdateDiscoverer) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v1/discoverers/id/{DiscovererId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2225,13 +2080,8 @@ func (m *awsRestjson1_serializeOpUpdateRegistry) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2311,13 +2161,8 @@ func (m *awsRestjson1_serializeOpUpdateSchema) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v1/registries/name/{RegistryName}/schemas/name/{SchemaName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/securityhub/go.mod b/service/securityhub/go.mod index 2de2157718d..46da6d1e514 100644 --- a/service/securityhub/go.mod +++ b/service/securityhub/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/securityhub/go.sum b/service/securityhub/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/securityhub/go.sum +++ b/service/securityhub/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/securityhub/serializers.go b/service/securityhub/serializers.go index 87a657f23e9..00abb275366 100644 --- a/service/securityhub/serializers.go +++ b/service/securityhub/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpAcceptInvitation) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/master") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -114,13 +109,8 @@ func (m *awsRestjson1_serializeOpBatchDisableStandards) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/standards/deregister") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -189,13 +179,8 @@ func (m *awsRestjson1_serializeOpBatchEnableStandards) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/standards/register") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -264,13 +249,8 @@ func (m *awsRestjson1_serializeOpBatchImportFindings) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/findings/import") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -339,13 +319,8 @@ func (m *awsRestjson1_serializeOpBatchUpdateFindings) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/findings/batchupdate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -471,13 +446,8 @@ func (m *awsRestjson1_serializeOpCreateActionTarget) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/actionTargets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -554,13 +524,8 @@ func (m *awsRestjson1_serializeOpCreateInsight) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/insights") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -639,13 +604,8 @@ func (m *awsRestjson1_serializeOpCreateMembers) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/members") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -714,13 +674,8 @@ func (m *awsRestjson1_serializeOpDeclineInvitations) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/invitations/decline") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -789,13 +744,8 @@ func (m *awsRestjson1_serializeOpDeleteActionTarget) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/actionTargets/{ActionTargetArn+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -852,13 +802,8 @@ func (m *awsRestjson1_serializeOpDeleteInsight) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/insights/{InsightArn+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -915,13 +860,8 @@ func (m *awsRestjson1_serializeOpDeleteInvitations) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/invitations/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -990,13 +930,8 @@ func (m *awsRestjson1_serializeOpDeleteMembers) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/members/delete") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1065,13 +1000,8 @@ func (m *awsRestjson1_serializeOpDescribeActionTargets) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/actionTargets/get") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1150,13 +1080,8 @@ func (m *awsRestjson1_serializeOpDescribeHub) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/accounts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1208,13 +1133,8 @@ func (m *awsRestjson1_serializeOpDescribeOrganizationConfiguration) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/organization/configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1258,13 +1178,8 @@ func (m *awsRestjson1_serializeOpDescribeProducts) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/products") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1324,13 +1239,8 @@ func (m *awsRestjson1_serializeOpDescribeStandards) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/standards") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1386,13 +1296,8 @@ func (m *awsRestjson1_serializeOpDescribeStandardsControls) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/standards/controls/{StandardsSubscriptionArn+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1457,13 +1362,8 @@ func (m *awsRestjson1_serializeOpDisableImportFindingsForProduct) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/productSubscriptions/{ProductSubscriptionArn+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1520,13 +1420,8 @@ func (m *awsRestjson1_serializeOpDisableOrganizationAdminAccount) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/organization/admin/disable") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1593,13 +1488,8 @@ func (m *awsRestjson1_serializeOpDisableSecurityHub) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/accounts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1643,13 +1533,8 @@ func (m *awsRestjson1_serializeOpDisassociateFromMasterAccount) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/master/disassociate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1693,13 +1578,8 @@ func (m *awsRestjson1_serializeOpDisassociateMembers) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/members/disassociate") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1768,13 +1648,8 @@ func (m *awsRestjson1_serializeOpEnableImportFindingsForProduct) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/productSubscriptions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1841,13 +1716,8 @@ func (m *awsRestjson1_serializeOpEnableOrganizationAdminAccount) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/organization/admin/enable") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1914,13 +1784,8 @@ func (m *awsRestjson1_serializeOpEnableSecurityHub) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/accounts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1994,13 +1859,8 @@ func (m *awsRestjson1_serializeOpGetEnabledStandards) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/standards/get") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2079,13 +1939,8 @@ func (m *awsRestjson1_serializeOpGetFindings) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/findings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2171,13 +2026,8 @@ func (m *awsRestjson1_serializeOpGetInsightResults) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/insights/results/{InsightArn+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2234,13 +2084,8 @@ func (m *awsRestjson1_serializeOpGetInsights) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/insights/get") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2319,13 +2164,8 @@ func (m *awsRestjson1_serializeOpGetInvitationsCount) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/invitations/count") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2369,13 +2209,8 @@ func (m *awsRestjson1_serializeOpGetMasterAccount) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/master") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2419,13 +2254,8 @@ func (m *awsRestjson1_serializeOpGetMembers) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/members/get") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2494,13 +2324,8 @@ func (m *awsRestjson1_serializeOpInviteMembers) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/members/invite") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2569,13 +2394,8 @@ func (m *awsRestjson1_serializeOpListEnabledProductsForImport) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/productSubscriptions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2631,13 +2451,8 @@ func (m *awsRestjson1_serializeOpListInvitations) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/invitations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2693,13 +2508,8 @@ func (m *awsRestjson1_serializeOpListMembers) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/members") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2759,13 +2569,8 @@ func (m *awsRestjson1_serializeOpListOrganizationAdminAccounts) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/organization/admin") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2821,13 +2626,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2884,13 +2684,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2972,13 +2767,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3041,13 +2831,8 @@ func (m *awsRestjson1_serializeOpUpdateActionTarget) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/actionTargets/{ActionTargetArn+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3132,13 +2917,8 @@ func (m *awsRestjson1_serializeOpUpdateFindings) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/findings") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3219,13 +2999,8 @@ func (m *awsRestjson1_serializeOpUpdateInsight) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/insights/{InsightArn+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3317,13 +3092,8 @@ func (m *awsRestjson1_serializeOpUpdateOrganizationConfiguration) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/organization/configuration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3390,13 +3160,8 @@ func (m *awsRestjson1_serializeOpUpdateSecurityHubConfiguration) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/accounts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3463,13 +3228,8 @@ func (m *awsRestjson1_serializeOpUpdateStandardsControl) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/standards/control/{StandardsControlArn+}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/serverlessapplicationrepository/go.mod b/service/serverlessapplicationrepository/go.mod index 27fc7bba40e..6df2a916f86 100644 --- a/service/serverlessapplicationrepository/go.mod +++ b/service/serverlessapplicationrepository/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/serverlessapplicationrepository/go.sum b/service/serverlessapplicationrepository/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/serverlessapplicationrepository/go.sum +++ b/service/serverlessapplicationrepository/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/serverlessapplicationrepository/serializers.go b/service/serverlessapplicationrepository/serializers.go index d1d6ff82425..85f3061f88c 100644 --- a/service/serverlessapplicationrepository/serializers.go +++ b/service/serverlessapplicationrepository/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateApplication) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -181,13 +176,8 @@ func (m *awsRestjson1_serializeOpCreateApplicationVersion) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/versions/{SemanticVersion}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -291,13 +281,8 @@ func (m *awsRestjson1_serializeOpCreateCloudFormationChangeSet) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/changesets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -444,13 +429,8 @@ func (m *awsRestjson1_serializeOpCreateCloudFormationTemplate) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/templates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -530,13 +510,8 @@ func (m *awsRestjson1_serializeOpDeleteApplication) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -593,13 +568,8 @@ func (m *awsRestjson1_serializeOpGetApplication) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -660,13 +630,8 @@ func (m *awsRestjson1_serializeOpGetApplicationPolicy) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -723,13 +688,8 @@ func (m *awsRestjson1_serializeOpGetCloudFormationTemplate) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/templates/{TemplateId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -795,13 +755,8 @@ func (m *awsRestjson1_serializeOpListApplicationDependencies) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/dependencies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -870,13 +825,8 @@ func (m *awsRestjson1_serializeOpListApplications) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/applications") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -932,13 +882,8 @@ func (m *awsRestjson1_serializeOpListApplicationVersions) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1003,13 +948,8 @@ func (m *awsRestjson1_serializeOpPutApplicationPolicy) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/policy") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1091,13 +1031,8 @@ func (m *awsRestjson1_serializeOpUnshareApplication) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}/unshare") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1177,13 +1112,8 @@ func (m *awsRestjson1_serializeOpUpdateApplication) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications/{ApplicationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/servicecatalogappregistry/go.mod b/service/servicecatalogappregistry/go.mod index 1820ad29a10..c860b9bfcb7 100644 --- a/service/servicecatalogappregistry/go.mod +++ b/service/servicecatalogappregistry/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/servicecatalogappregistry/go.sum b/service/servicecatalogappregistry/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/servicecatalogappregistry/go.sum +++ b/service/servicecatalogappregistry/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/servicecatalogappregistry/serializers.go b/service/servicecatalogappregistry/serializers.go index 562d06dbe5d..f761e02eb9e 100644 --- a/service/servicecatalogappregistry/serializers.go +++ b/service/servicecatalogappregistry/serializers.go @@ -35,13 +35,8 @@ func (m *awsRestjson1_serializeOpAssociateAttributeGroup) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/applications/{application}/attribute-groups/{attributeGroup}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -107,13 +102,8 @@ func (m *awsRestjson1_serializeOpAssociateResource) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications/{application}/resources/{resourceType}/{resource}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -188,13 +178,8 @@ func (m *awsRestjson1_serializeOpCreateApplication) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -278,13 +263,8 @@ func (m *awsRestjson1_serializeOpCreateAttributeGroup) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/attribute-groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -373,13 +353,8 @@ func (m *awsRestjson1_serializeOpDeleteApplication) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications/{application}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -436,13 +411,8 @@ func (m *awsRestjson1_serializeOpDeleteAttributeGroup) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/attribute-groups/{attributeGroup}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -499,13 +469,8 @@ func (m *awsRestjson1_serializeOpDisassociateAttributeGroup) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/applications/{application}/attribute-groups/{attributeGroup}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -571,13 +536,8 @@ func (m *awsRestjson1_serializeOpDisassociateResource) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/applications/{application}/resources/{resourceType}/{resource}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -652,13 +612,8 @@ func (m *awsRestjson1_serializeOpGetApplication) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/applications/{application}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -715,13 +670,8 @@ func (m *awsRestjson1_serializeOpGetAttributeGroup) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/attribute-groups/{attributeGroup}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -778,13 +728,8 @@ func (m *awsRestjson1_serializeOpListApplications) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/applications") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -840,13 +785,8 @@ func (m *awsRestjson1_serializeOpListAssociatedAttributeGroups) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/applications/{application}/attribute-groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -911,13 +851,8 @@ func (m *awsRestjson1_serializeOpListAssociatedResources) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/applications/{application}/resources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -982,13 +917,8 @@ func (m *awsRestjson1_serializeOpListAttributeGroups) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/attribute-groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1044,13 +974,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1107,13 +1032,8 @@ func (m *awsRestjson1_serializeOpSyncResource) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/sync/{resourceType}/{resource}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1179,13 +1099,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1267,13 +1182,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1336,13 +1246,8 @@ func (m *awsRestjson1_serializeOpUpdateApplication) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/applications/{application}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1427,13 +1332,8 @@ func (m *awsRestjson1_serializeOpUpdateAttributeGroup) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/attribute-groups/{attributeGroup}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/sesv2/go.mod b/service/sesv2/go.mod index f660c8d1dab..cd4fddd8f9a 100644 --- a/service/sesv2/go.mod +++ b/service/sesv2/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sesv2/go.sum b/service/sesv2/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/sesv2/go.sum +++ b/service/sesv2/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sesv2/serializers.go b/service/sesv2/serializers.go index 3f4593e5465..7b922c4b11e 100644 --- a/service/sesv2/serializers.go +++ b/service/sesv2/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpCreateConfigurationSet) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v2/email/configuration-sets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -152,13 +147,8 @@ func (m *awsRestjson1_serializeOpCreateConfigurationSetEventDestination) HandleS } opPath, opQuery := httpbinding.SplitURI("/v2/email/configuration-sets/{ConfigurationSetName}/event-destinations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -245,13 +235,8 @@ func (m *awsRestjson1_serializeOpCreateContact) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v2/email/contact-lists/{ContactListName}/contacts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -348,13 +333,8 @@ func (m *awsRestjson1_serializeOpCreateContactList) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v2/email/contact-lists") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -440,13 +420,8 @@ func (m *awsRestjson1_serializeOpCreateCustomVerificationEmailTemplate) HandleSe } opPath, opQuery := httpbinding.SplitURI("/v2/email/custom-verification-email-templates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -538,13 +513,8 @@ func (m *awsRestjson1_serializeOpCreateDedicatedIpPool) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v2/email/dedicated-ip-pools") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -618,13 +588,8 @@ func (m *awsRestjson1_serializeOpCreateDeliverabilityTestReport) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/v2/email/deliverability-dashboard/test") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -710,13 +675,8 @@ func (m *awsRestjson1_serializeOpCreateEmailIdentity) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2/email/identities") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -802,13 +762,8 @@ func (m *awsRestjson1_serializeOpCreateEmailIdentityPolicy) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v2/email/identities/{EmailIdentity}/policies/{PolicyName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -897,13 +852,8 @@ func (m *awsRestjson1_serializeOpCreateEmailTemplate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2/email/templates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -977,13 +927,8 @@ func (m *awsRestjson1_serializeOpCreateImportJob) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v2/email/import-jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1059,13 +1004,8 @@ func (m *awsRestjson1_serializeOpDeleteConfigurationSet) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/v2/email/configuration-sets/{ConfigurationSetName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1122,13 +1062,8 @@ func (m *awsRestjson1_serializeOpDeleteConfigurationSetEventDestination) HandleS } opPath, opQuery := httpbinding.SplitURI("/v2/email/configuration-sets/{ConfigurationSetName}/event-destinations/{EventDestinationName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1194,13 +1129,8 @@ func (m *awsRestjson1_serializeOpDeleteContact) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v2/email/contact-lists/{ContactListName}/contacts/{EmailAddress}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1266,13 +1196,8 @@ func (m *awsRestjson1_serializeOpDeleteContactList) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v2/email/contact-lists/{ContactListName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1329,13 +1254,8 @@ func (m *awsRestjson1_serializeOpDeleteCustomVerificationEmailTemplate) HandleSe } opPath, opQuery := httpbinding.SplitURI("/v2/email/custom-verification-email-templates/{TemplateName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1392,13 +1312,8 @@ func (m *awsRestjson1_serializeOpDeleteDedicatedIpPool) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v2/email/dedicated-ip-pools/{PoolName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1455,13 +1370,8 @@ func (m *awsRestjson1_serializeOpDeleteEmailIdentity) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2/email/identities/{EmailIdentity}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1518,13 +1428,8 @@ func (m *awsRestjson1_serializeOpDeleteEmailIdentityPolicy) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v2/email/identities/{EmailIdentity}/policies/{PolicyName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1590,13 +1495,8 @@ func (m *awsRestjson1_serializeOpDeleteEmailTemplate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2/email/templates/{TemplateName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1653,13 +1553,8 @@ func (m *awsRestjson1_serializeOpDeleteSuppressedDestination) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/v2/email/suppression/addresses/{EmailAddress}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1716,13 +1611,8 @@ func (m *awsRestjson1_serializeOpGetAccount) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v2/email/account") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1766,13 +1656,8 @@ func (m *awsRestjson1_serializeOpGetBlacklistReports) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2/email/deliverability-dashboard/blacklist-report") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1826,13 +1711,8 @@ func (m *awsRestjson1_serializeOpGetConfigurationSet) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2/email/configuration-sets/{ConfigurationSetName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1889,13 +1769,8 @@ func (m *awsRestjson1_serializeOpGetConfigurationSetEventDestinations) HandleSer } opPath, opQuery := httpbinding.SplitURI("/v2/email/configuration-sets/{ConfigurationSetName}/event-destinations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1952,13 +1827,8 @@ func (m *awsRestjson1_serializeOpGetContact) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/v2/email/contact-lists/{ContactListName}/contacts/{EmailAddress}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2024,13 +1894,8 @@ func (m *awsRestjson1_serializeOpGetContactList) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v2/email/contact-lists/{ContactListName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2087,13 +1952,8 @@ func (m *awsRestjson1_serializeOpGetCustomVerificationEmailTemplate) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/v2/email/custom-verification-email-templates/{TemplateName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2150,13 +2010,8 @@ func (m *awsRestjson1_serializeOpGetDedicatedIp) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v2/email/dedicated-ips/{Ip}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2213,13 +2068,8 @@ func (m *awsRestjson1_serializeOpGetDedicatedIps) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/v2/email/dedicated-ips") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2279,13 +2129,8 @@ func (m *awsRestjson1_serializeOpGetDeliverabilityDashboardOptions) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/v2/email/deliverability-dashboard") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2329,13 +2174,8 @@ func (m *awsRestjson1_serializeOpGetDeliverabilityTestReport) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/v2/email/deliverability-dashboard/test-reports/{ReportId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2392,13 +2232,8 @@ func (m *awsRestjson1_serializeOpGetDomainDeliverabilityCampaign) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/v2/email/deliverability-dashboard/campaigns/{CampaignId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2455,13 +2290,8 @@ func (m *awsRestjson1_serializeOpGetDomainStatisticsReport) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v2/email/deliverability-dashboard/statistics-report/{Domain}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2526,13 +2356,8 @@ func (m *awsRestjson1_serializeOpGetEmailIdentity) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/email/identities/{EmailIdentity}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2589,13 +2414,8 @@ func (m *awsRestjson1_serializeOpGetEmailIdentityPolicies) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/v2/email/identities/{EmailIdentity}/policies") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2652,13 +2472,8 @@ func (m *awsRestjson1_serializeOpGetEmailTemplate) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/email/templates/{TemplateName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2715,13 +2530,8 @@ func (m *awsRestjson1_serializeOpGetImportJob) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v2/email/import-jobs/{JobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2778,13 +2588,8 @@ func (m *awsRestjson1_serializeOpGetSuppressedDestination) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/v2/email/suppression/addresses/{EmailAddress}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2841,13 +2646,8 @@ func (m *awsRestjson1_serializeOpListConfigurationSets) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/v2/email/configuration-sets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2903,13 +2703,8 @@ func (m *awsRestjson1_serializeOpListContactLists) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/v2/email/contact-lists") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2965,13 +2760,8 @@ func (m *awsRestjson1_serializeOpListContacts) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/v2/email/contact-lists/{ContactListName}/contacts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3061,13 +2851,8 @@ func (m *awsRestjson1_serializeOpListCustomVerificationEmailTemplates) HandleSer } opPath, opQuery := httpbinding.SplitURI("/v2/email/custom-verification-email-templates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3123,13 +2908,8 @@ func (m *awsRestjson1_serializeOpListDedicatedIpPools) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v2/email/dedicated-ip-pools") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3185,13 +2965,8 @@ func (m *awsRestjson1_serializeOpListDeliverabilityTestReports) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/v2/email/deliverability-dashboard/test-reports") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3247,13 +3022,8 @@ func (m *awsRestjson1_serializeOpListDomainDeliverabilityCampaigns) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/v2/email/deliverability-dashboard/domains/{SubscribedDomain}/campaigns") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3326,13 +3096,8 @@ func (m *awsRestjson1_serializeOpListEmailIdentities) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2/email/identities") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3388,13 +3153,8 @@ func (m *awsRestjson1_serializeOpListEmailTemplates) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/v2/email/templates") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3450,13 +3210,8 @@ func (m *awsRestjson1_serializeOpListImportJobs) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/v2/email/import-jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3535,13 +3290,8 @@ func (m *awsRestjson1_serializeOpListSuppressedDestinations) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v2/email/suppression/addresses") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3611,13 +3361,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2/email/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3669,13 +3414,8 @@ func (m *awsRestjson1_serializeOpPutAccountDedicatedIpWarmupAttributes) HandleSe } opPath, opQuery := httpbinding.SplitURI("/v2/email/account/dedicated-ips/warmup") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3742,13 +3482,8 @@ func (m *awsRestjson1_serializeOpPutAccountDetails) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v2/email/account/details") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3842,13 +3577,8 @@ func (m *awsRestjson1_serializeOpPutAccountSendingAttributes) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/v2/email/account/sending") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3915,13 +3645,8 @@ func (m *awsRestjson1_serializeOpPutAccountSuppressionAttributes) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/v2/email/account/suppression") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3990,13 +3715,8 @@ func (m *awsRestjson1_serializeOpPutConfigurationSetDeliveryOptions) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/v2/email/configuration-sets/{ConfigurationSetName}/delivery-options") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4081,13 +3801,8 @@ func (m *awsRestjson1_serializeOpPutConfigurationSetReputationOptions) HandleSer } opPath, opQuery := httpbinding.SplitURI("/v2/email/configuration-sets/{ConfigurationSetName}/reputation-options") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4167,13 +3882,8 @@ func (m *awsRestjson1_serializeOpPutConfigurationSetSendingOptions) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/v2/email/configuration-sets/{ConfigurationSetName}/sending") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4253,13 +3963,8 @@ func (m *awsRestjson1_serializeOpPutConfigurationSetSuppressionOptions) HandleSe } opPath, opQuery := httpbinding.SplitURI("/v2/email/configuration-sets/{ConfigurationSetName}/suppression-options") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4341,13 +4046,8 @@ func (m *awsRestjson1_serializeOpPutConfigurationSetTrackingOptions) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/v2/email/configuration-sets/{ConfigurationSetName}/tracking-options") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4427,13 +4127,8 @@ func (m *awsRestjson1_serializeOpPutDedicatedIpInPool) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/v2/email/dedicated-ips/{Ip}/pool") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4513,13 +4208,8 @@ func (m *awsRestjson1_serializeOpPutDedicatedIpWarmupAttributes) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/v2/email/dedicated-ips/{Ip}/warmup") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4599,13 +4289,8 @@ func (m *awsRestjson1_serializeOpPutDeliverabilityDashboardOption) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/v2/email/deliverability-dashboard") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4679,13 +4364,8 @@ func (m *awsRestjson1_serializeOpPutEmailIdentityConfigurationSetAttributes) Han } opPath, opQuery := httpbinding.SplitURI("/v2/email/identities/{EmailIdentity}/configuration-set") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4765,13 +4445,8 @@ func (m *awsRestjson1_serializeOpPutEmailIdentityDkimAttributes) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/v2/email/identities/{EmailIdentity}/dkim") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4851,13 +4526,8 @@ func (m *awsRestjson1_serializeOpPutEmailIdentityDkimSigningAttributes) HandleSe } opPath, opQuery := httpbinding.SplitURI("/v1/email/identities/{EmailIdentity}/dkim/signing") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -4944,13 +4614,8 @@ func (m *awsRestjson1_serializeOpPutEmailIdentityFeedbackAttributes) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/v2/email/identities/{EmailIdentity}/feedback") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5030,13 +4695,8 @@ func (m *awsRestjson1_serializeOpPutEmailIdentityMailFromAttributes) HandleSeria } opPath, opQuery := httpbinding.SplitURI("/v2/email/identities/{EmailIdentity}/mail-from") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5121,13 +4781,8 @@ func (m *awsRestjson1_serializeOpPutSuppressedDestination) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/v2/email/suppression/addresses") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5199,13 +4854,8 @@ func (m *awsRestjson1_serializeOpSendBulkEmail) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v2/email/outbound-bulk-emails") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5320,13 +4970,8 @@ func (m *awsRestjson1_serializeOpSendCustomVerificationEmail) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/v2/email/outbound-custom-verification-emails") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5403,13 +5048,8 @@ func (m *awsRestjson1_serializeOpSendEmail) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/v2/email/outbound-emails") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5531,13 +5171,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/v2/email/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5611,13 +5246,8 @@ func (m *awsRestjson1_serializeOpTestRenderEmailTemplate) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/v2/email/templates/{TemplateName}/render") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5697,13 +5327,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v2/email/tags") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5761,13 +5386,8 @@ func (m *awsRestjson1_serializeOpUpdateConfigurationSetEventDestination) HandleS } opPath, opQuery := httpbinding.SplitURI("/v2/email/configuration-sets/{ConfigurationSetName}/event-destinations/{EventDestinationName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5858,13 +5478,8 @@ func (m *awsRestjson1_serializeOpUpdateContact) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/v2/email/contact-lists/{ContactListName}/contacts/{EmailAddress}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -5965,13 +5580,8 @@ func (m *awsRestjson1_serializeOpUpdateContactList) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/v2/email/contact-lists/{ContactListName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6058,13 +5668,8 @@ func (m *awsRestjson1_serializeOpUpdateCustomVerificationEmailTemplate) HandleSe } opPath, opQuery := httpbinding.SplitURI("/v2/email/custom-verification-email-templates/{TemplateName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6164,13 +5769,8 @@ func (m *awsRestjson1_serializeOpUpdateEmailIdentityPolicy) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/v2/email/identities/{EmailIdentity}/policies/{PolicyName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -6259,13 +5859,8 @@ func (m *awsRestjson1_serializeOpUpdateEmailTemplate) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/v2/email/templates/{TemplateName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/signer/go.mod b/service/signer/go.mod index 90501666fb2..2ec83c192e7 100644 --- a/service/signer/go.mod +++ b/service/signer/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a github.com/jmespath/go-jmespath v0.4.0 ) diff --git a/service/signer/go.sum b/service/signer/go.sum index d937214c3eb..9ddcad9aa66 100644 --- a/service/signer/go.sum +++ b/service/signer/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= 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.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= diff --git a/service/signer/serializers.go b/service/signer/serializers.go index 4de66d67c90..ad42f5fad10 100644 --- a/service/signer/serializers.go +++ b/service/signer/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpAddProfilePermission) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/signing-profiles/{profileName}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -143,13 +138,8 @@ func (m *awsRestjson1_serializeOpCancelSigningProfile) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/signing-profiles/{profileName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -206,13 +196,8 @@ func (m *awsRestjson1_serializeOpDescribeSigningJob) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/signing-jobs/{jobId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -269,13 +254,8 @@ func (m *awsRestjson1_serializeOpGetSigningPlatform) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/signing-platforms/{platformId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -332,13 +312,8 @@ func (m *awsRestjson1_serializeOpGetSigningProfile) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/signing-profiles/{profileName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -399,13 +374,8 @@ func (m *awsRestjson1_serializeOpListProfilePermissions) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/signing-profiles/{profileName}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -466,13 +436,8 @@ func (m *awsRestjson1_serializeOpListSigningJobs) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/signing-jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -556,13 +521,8 @@ func (m *awsRestjson1_serializeOpListSigningPlatforms) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/signing-platforms") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -630,13 +590,8 @@ func (m *awsRestjson1_serializeOpListSigningProfiles) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/signing-profiles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -706,13 +661,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -769,13 +719,8 @@ func (m *awsRestjson1_serializeOpPutSigningProfile) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/signing-profiles/{profileName}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -890,13 +835,8 @@ func (m *awsRestjson1_serializeOpRemoveProfilePermission) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/signing-profiles/{profileName}/permissions/{statementId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -966,13 +906,8 @@ func (m *awsRestjson1_serializeOpRevokeSignature) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/signing-jobs/{jobId}/revoke") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1057,13 +992,8 @@ func (m *awsRestjson1_serializeOpRevokeSigningProfile) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/signing-profiles/{profileName}/revoke") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1153,13 +1083,8 @@ func (m *awsRestjson1_serializeOpStartSigningJob) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/signing-jobs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1250,13 +1175,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1338,13 +1258,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{resourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/sso/go.mod b/service/sso/go.mod index b6b9decdc2d..9a8081d9cb3 100644 --- a/service/sso/go.mod +++ b/service/sso/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/sso/go.sum b/service/sso/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/sso/go.sum +++ b/service/sso/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/sso/serializers.go b/service/sso/serializers.go index ea20305b2d0..29e32081194 100644 --- a/service/sso/serializers.go +++ b/service/sso/serializers.go @@ -33,13 +33,8 @@ func (m *awsRestjson1_serializeOpGetRoleCredentials) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/federation/credentials") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -100,13 +95,8 @@ func (m *awsRestjson1_serializeOpListAccountRoles) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/assignment/roles") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -171,13 +161,8 @@ func (m *awsRestjson1_serializeOpListAccounts) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/assignment/accounts") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -238,13 +223,8 @@ func (m *awsRestjson1_serializeOpLogout) HandleSerialize(ctx context.Context, in } opPath, opQuery := httpbinding.SplitURI("/logout") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/ssooidc/go.mod b/service/ssooidc/go.mod index 3094db01871..6630c8bf3ca 100644 --- a/service/ssooidc/go.mod +++ b/service/ssooidc/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/ssooidc/go.sum b/service/ssooidc/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/ssooidc/go.sum +++ b/service/ssooidc/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/ssooidc/serializers.go b/service/ssooidc/serializers.go index 031e80a184a..a8cfd7b46c5 100644 --- a/service/ssooidc/serializers.go +++ b/service/ssooidc/serializers.go @@ -35,13 +35,8 @@ func (m *awsRestjson1_serializeOpCreateToken) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/token") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -145,13 +140,8 @@ func (m *awsRestjson1_serializeOpRegisterClient) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/client/register") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -230,13 +220,8 @@ func (m *awsRestjson1_serializeOpStartDeviceAuthorization) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/device_authorization") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/synthetics/go.mod b/service/synthetics/go.mod index 64d2d6043f7..1178203910d 100644 --- a/service/synthetics/go.mod +++ b/service/synthetics/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/synthetics/go.sum b/service/synthetics/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/synthetics/go.sum +++ b/service/synthetics/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/synthetics/serializers.go b/service/synthetics/serializers.go index 7ddd530627e..c3734febc2b 100644 --- a/service/synthetics/serializers.go +++ b/service/synthetics/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpCreateCanary) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/canary") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -169,13 +164,8 @@ func (m *awsRestjson1_serializeOpDeleteCanary) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/canary/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -232,13 +222,8 @@ func (m *awsRestjson1_serializeOpDescribeCanaries) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/canaries") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -310,13 +295,8 @@ func (m *awsRestjson1_serializeOpDescribeCanariesLastRun) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/canaries/last-run") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -388,13 +368,8 @@ func (m *awsRestjson1_serializeOpDescribeRuntimeVersions) HandleSerialize(ctx co } opPath, opQuery := httpbinding.SplitURI("/runtime-versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -466,13 +441,8 @@ func (m *awsRestjson1_serializeOpGetCanary) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/canary/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -529,13 +499,8 @@ func (m *awsRestjson1_serializeOpGetCanaryRuns) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/canary/{Name}/runs") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -620,13 +585,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -683,13 +643,8 @@ func (m *awsRestjson1_serializeOpStartCanary) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/canary/{Name}/start") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -746,13 +701,8 @@ func (m *awsRestjson1_serializeOpStopCanary) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/canary/{Name}/stop") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -809,13 +759,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -897,13 +842,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -966,13 +906,8 @@ func (m *awsRestjson1_serializeOpUpdateCanary) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/canary/{Name}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/wellarchitected/go.mod b/service/wellarchitected/go.mod index a3460145825..27f21d66b73 100644 --- a/service/wellarchitected/go.mod +++ b/service/wellarchitected/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/wellarchitected/go.sum b/service/wellarchitected/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/wellarchitected/go.sum +++ b/service/wellarchitected/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/wellarchitected/serializers.go b/service/wellarchitected/serializers.go index 80e16c03813..bc0ca1ed374 100644 --- a/service/wellarchitected/serializers.go +++ b/service/wellarchitected/serializers.go @@ -35,13 +35,8 @@ func (m *awsRestjson1_serializeOpAssociateLenses) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/associateLenses") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -123,13 +118,8 @@ func (m *awsRestjson1_serializeOpCreateMilestone) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/milestones") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -214,13 +204,8 @@ func (m *awsRestjson1_serializeOpCreateWorkload) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/workloads") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -369,13 +354,8 @@ func (m *awsRestjson1_serializeOpCreateWorkloadShare) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/shares") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -465,13 +445,8 @@ func (m *awsRestjson1_serializeOpDeleteWorkload) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -532,13 +507,8 @@ func (m *awsRestjson1_serializeOpDeleteWorkloadShare) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/shares/{ShareId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -608,13 +578,8 @@ func (m *awsRestjson1_serializeOpDisassociateLenses) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/disassociateLenses") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -696,13 +661,8 @@ func (m *awsRestjson1_serializeOpGetAnswer) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/lensReviews/{LensAlias}/answers/{QuestionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -781,13 +741,8 @@ func (m *awsRestjson1_serializeOpGetLensReview) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/lensReviews/{LensAlias}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -857,13 +812,8 @@ func (m *awsRestjson1_serializeOpGetLensReviewReport) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/lensReviews/{LensAlias}/report") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -933,13 +883,8 @@ func (m *awsRestjson1_serializeOpGetLensVersionDifference) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/lenses/{LensAlias}/versionDifference") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1000,13 +945,8 @@ func (m *awsRestjson1_serializeOpGetMilestone) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/milestones/{MilestoneNumber}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1069,13 +1009,8 @@ func (m *awsRestjson1_serializeOpGetWorkload) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1132,13 +1067,8 @@ func (m *awsRestjson1_serializeOpListAnswers) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/lensReviews/{LensAlias}/answers") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1220,13 +1150,8 @@ func (m *awsRestjson1_serializeOpListLenses) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/lenses") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1282,13 +1207,8 @@ func (m *awsRestjson1_serializeOpListLensReviewImprovements) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/lensReviews/{LensAlias}/improvements") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1370,13 +1290,8 @@ func (m *awsRestjson1_serializeOpListLensReviews) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/lensReviews") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1445,13 +1360,8 @@ func (m *awsRestjson1_serializeOpListMilestones) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/milestonesSummaries") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1536,13 +1446,8 @@ func (m *awsRestjson1_serializeOpListNotifications) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/notifications") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1619,13 +1524,8 @@ func (m *awsRestjson1_serializeOpListShareInvitations) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/shareInvitations") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1685,13 +1585,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{WorkloadArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1748,13 +1643,8 @@ func (m *awsRestjson1_serializeOpListWorkloads) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/workloadsSummaries") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1831,13 +1721,8 @@ func (m *awsRestjson1_serializeOpListWorkloadShares) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/shares") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1906,13 +1791,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{WorkloadArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1994,13 +1874,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{WorkloadArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2063,13 +1938,8 @@ func (m *awsRestjson1_serializeOpUpdateAnswer) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/lensReviews/{LensAlias}/answers/{QuestionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2179,13 +2049,8 @@ func (m *awsRestjson1_serializeOpUpdateLensReview) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/lensReviews/{LensAlias}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2281,13 +2146,8 @@ func (m *awsRestjson1_serializeOpUpdateShareInvitation) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/shareInvitations/{ShareInvitationId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2367,13 +2227,8 @@ func (m *awsRestjson1_serializeOpUpdateWorkload) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2526,13 +2381,8 @@ func (m *awsRestjson1_serializeOpUpdateWorkloadShare) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/shares/{ShareId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2621,13 +2471,8 @@ func (m *awsRestjson1_serializeOpUpgradeLensReview) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/workloads/{WorkloadId}/lensReviews/{LensAlias}/upgrade") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/workdocs/go.mod b/service/workdocs/go.mod index ec7dea8d697..7a2081b61f2 100644 --- a/service/workdocs/go.mod +++ b/service/workdocs/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/workdocs/go.sum b/service/workdocs/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/workdocs/go.sum +++ b/service/workdocs/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/workdocs/serializers.go b/service/workdocs/serializers.go index c4c6d61058e..0668c5e9093 100644 --- a/service/workdocs/serializers.go +++ b/service/workdocs/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpAbortDocumentVersionUpload) HandleSerialize(ctx } opPath, opQuery := httpbinding.SplitURI("/api/v1/documents/{DocumentId}/versions/{VersionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -114,13 +109,8 @@ func (m *awsRestjson1_serializeOpActivateUser) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/api/v1/users/{UserId}/activation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -182,13 +172,8 @@ func (m *awsRestjson1_serializeOpAddResourcePermissions) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/api/v1/resources/{ResourceId}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -282,13 +267,8 @@ func (m *awsRestjson1_serializeOpCreateComment) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/api/v1/documents/{DocumentId}/versions/{VersionId}/comment") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -402,13 +382,8 @@ func (m *awsRestjson1_serializeOpCreateCustomMetadata) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/api/v1/resources/{ResourceId}/customMetadata") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -499,13 +474,8 @@ func (m *awsRestjson1_serializeOpCreateFolder) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/api/v1/folders") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -586,13 +556,8 @@ func (m *awsRestjson1_serializeOpCreateLabels) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/api/v1/resources/{ResourceId}/labels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PUT" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -679,13 +644,8 @@ func (m *awsRestjson1_serializeOpCreateNotificationSubscription) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/api/v1/organizations/{OrganizationId}/subscriptions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -775,13 +735,8 @@ func (m *awsRestjson1_serializeOpCreateUser) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/api/v1/users") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -894,13 +849,8 @@ func (m *awsRestjson1_serializeOpDeactivateUser) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/api/v1/users/{UserId}/activation") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -962,13 +912,8 @@ func (m *awsRestjson1_serializeOpDeleteComment) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/api/v1/documents/{DocumentId}/versions/{VersionId}/comment/{CommentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1048,13 +993,8 @@ func (m *awsRestjson1_serializeOpDeleteCustomMetadata) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/api/v1/resources/{ResourceId}/customMetadata") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1130,13 +1070,8 @@ func (m *awsRestjson1_serializeOpDeleteDocument) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/api/v1/documents/{DocumentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1198,13 +1133,8 @@ func (m *awsRestjson1_serializeOpDeleteFolder) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/api/v1/folders/{FolderId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1266,13 +1196,8 @@ func (m *awsRestjson1_serializeOpDeleteFolderContents) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/api/v1/folders/{FolderId}/contents") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1334,13 +1259,8 @@ func (m *awsRestjson1_serializeOpDeleteLabels) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/api/v1/resources/{ResourceId}/labels") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1412,13 +1332,8 @@ func (m *awsRestjson1_serializeOpDeleteNotificationSubscription) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/api/v1/organizations/{OrganizationId}/subscriptions/{SubscriptionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1484,13 +1399,8 @@ func (m *awsRestjson1_serializeOpDeleteUser) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/api/v1/users/{UserId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1552,13 +1462,8 @@ func (m *awsRestjson1_serializeOpDescribeActivities) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/api/v1/activities") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1647,13 +1552,8 @@ func (m *awsRestjson1_serializeOpDescribeComments) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/api/v1/documents/{DocumentId}/versions/{VersionId}/comments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1732,13 +1632,8 @@ func (m *awsRestjson1_serializeOpDescribeDocumentVersions) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/api/v1/documents/{DocumentId}/versions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1816,13 +1711,8 @@ func (m *awsRestjson1_serializeOpDescribeFolderContents) HandleSerialize(ctx con } opPath, opQuery := httpbinding.SplitURI("/api/v1/folders/{FolderId}/contents") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1908,13 +1798,8 @@ func (m *awsRestjson1_serializeOpDescribeGroups) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/api/v1/groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1983,13 +1868,8 @@ func (m *awsRestjson1_serializeOpDescribeNotificationSubscriptions) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/api/v1/organizations/{OrganizationId}/subscriptions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2054,13 +1934,8 @@ func (m *awsRestjson1_serializeOpDescribeResourcePermissions) HandleSerialize(ct } opPath, opQuery := httpbinding.SplitURI("/api/v1/resources/{ResourceId}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2134,13 +2009,8 @@ func (m *awsRestjson1_serializeOpDescribeRootFolders) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/api/v1/me/root") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2201,13 +2071,8 @@ func (m *awsRestjson1_serializeOpDescribeUsers) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/api/v1/users") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2296,13 +2161,8 @@ func (m *awsRestjson1_serializeOpGetCurrentUser) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/api/v1/me") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2355,13 +2215,8 @@ func (m *awsRestjson1_serializeOpGetDocument) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/api/v1/documents/{DocumentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2427,13 +2282,8 @@ func (m *awsRestjson1_serializeOpGetDocumentPath) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/api/v1/documents/{DocumentId}/path") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2507,13 +2357,8 @@ func (m *awsRestjson1_serializeOpGetDocumentVersion) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/api/v1/documents/{DocumentId}/versions/{VersionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2592,13 +2437,8 @@ func (m *awsRestjson1_serializeOpGetFolder) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/api/v1/folders/{FolderId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2664,13 +2504,8 @@ func (m *awsRestjson1_serializeOpGetFolderPath) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/api/v1/folders/{FolderId}/path") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2744,13 +2579,8 @@ func (m *awsRestjson1_serializeOpGetResources) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/api/v1/resources") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2819,13 +2649,8 @@ func (m *awsRestjson1_serializeOpInitiateDocumentVersionUpload) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/api/v1/documents") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2931,13 +2756,8 @@ func (m *awsRestjson1_serializeOpRemoveAllResourcePermissions) HandleSerialize(c } opPath, opQuery := httpbinding.SplitURI("/api/v1/resources/{ResourceId}/permissions") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2999,13 +2819,8 @@ func (m *awsRestjson1_serializeOpRemoveResourcePermission) HandleSerialize(ctx c } opPath, opQuery := httpbinding.SplitURI("/api/v1/resources/{ResourceId}/permissions/{PrincipalId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3080,13 +2895,8 @@ func (m *awsRestjson1_serializeOpUpdateDocument) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/api/v1/documents/{DocumentId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3181,13 +2991,8 @@ func (m *awsRestjson1_serializeOpUpdateDocumentVersion) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/api/v1/documents/{DocumentId}/versions/{VersionId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3281,13 +3086,8 @@ func (m *awsRestjson1_serializeOpUpdateFolder) HandleSerialize(ctx context.Conte } opPath, opQuery := httpbinding.SplitURI("/api/v1/folders/{FolderId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -3382,13 +3182,8 @@ func (m *awsRestjson1_serializeOpUpdateUser) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/api/v1/users/{UserId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "PATCH" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/worklink/go.mod b/service/worklink/go.mod index 8a397865d11..fc6bf59460a 100644 --- a/service/worklink/go.mod +++ b/service/worklink/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/worklink/go.sum b/service/worklink/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/worklink/go.sum +++ b/service/worklink/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/worklink/serializers.go b/service/worklink/serializers.go index c9442438780..64cf6612302 100644 --- a/service/worklink/serializers.go +++ b/service/worklink/serializers.go @@ -35,13 +35,8 @@ func (m *awsRestjson1_serializeOpAssociateDomain) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/associateDomain") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -123,13 +118,8 @@ func (m *awsRestjson1_serializeOpAssociateWebsiteAuthorizationProvider) HandleSe } opPath, opQuery := httpbinding.SplitURI("/associateWebsiteAuthorizationProvider") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -206,13 +196,8 @@ func (m *awsRestjson1_serializeOpAssociateWebsiteCertificateAuthority) HandleSer } opPath, opQuery := httpbinding.SplitURI("/associateWebsiteCertificateAuthority") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -289,13 +274,8 @@ func (m *awsRestjson1_serializeOpCreateFleet) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/createFleet") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -379,13 +359,8 @@ func (m *awsRestjson1_serializeOpDeleteFleet) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/deleteFleet") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -452,13 +427,8 @@ func (m *awsRestjson1_serializeOpDescribeAuditStreamConfiguration) HandleSeriali } opPath, opQuery := httpbinding.SplitURI("/describeAuditStreamConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -525,13 +495,8 @@ func (m *awsRestjson1_serializeOpDescribeCompanyNetworkConfiguration) HandleSeri } opPath, opQuery := httpbinding.SplitURI("/describeCompanyNetworkConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -598,13 +563,8 @@ func (m *awsRestjson1_serializeOpDescribeDevice) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/describeDevice") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -676,13 +636,8 @@ func (m *awsRestjson1_serializeOpDescribeDevicePolicyConfiguration) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/describeDevicePolicyConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -749,13 +704,8 @@ func (m *awsRestjson1_serializeOpDescribeDomain) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/describeDomain") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -827,13 +777,8 @@ func (m *awsRestjson1_serializeOpDescribeFleetMetadata) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/describeFleetMetadata") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -900,13 +845,8 @@ func (m *awsRestjson1_serializeOpDescribeIdentityProviderConfiguration) HandleSe } opPath, opQuery := httpbinding.SplitURI("/describeIdentityProviderConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -973,13 +913,8 @@ func (m *awsRestjson1_serializeOpDescribeWebsiteCertificateAuthority) HandleSeri } opPath, opQuery := httpbinding.SplitURI("/describeWebsiteCertificateAuthority") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1051,13 +986,8 @@ func (m *awsRestjson1_serializeOpDisassociateDomain) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/disassociateDomain") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1129,13 +1059,8 @@ func (m *awsRestjson1_serializeOpDisassociateWebsiteAuthorizationProvider) Handl } opPath, opQuery := httpbinding.SplitURI("/disassociateWebsiteAuthorizationProvider") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1207,13 +1132,8 @@ func (m *awsRestjson1_serializeOpDisassociateWebsiteCertificateAuthority) Handle } opPath, opQuery := httpbinding.SplitURI("/disassociateWebsiteCertificateAuthority") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1285,13 +1205,8 @@ func (m *awsRestjson1_serializeOpListDevices) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/listDevices") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1368,13 +1283,8 @@ func (m *awsRestjson1_serializeOpListDomains) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/listDomains") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1451,13 +1361,8 @@ func (m *awsRestjson1_serializeOpListFleets) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/listFleets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1529,13 +1434,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1592,13 +1492,8 @@ func (m *awsRestjson1_serializeOpListWebsiteAuthorizationProviders) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/listWebsiteAuthorizationProviders") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1675,13 +1570,8 @@ func (m *awsRestjson1_serializeOpListWebsiteCertificateAuthorities) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/listWebsiteCertificateAuthorities") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1758,13 +1648,8 @@ func (m *awsRestjson1_serializeOpRestoreDomainAccess) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/restoreDomainAccess") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1836,13 +1721,8 @@ func (m *awsRestjson1_serializeOpRevokeDomainAccess) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/revokeDomainAccess") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1914,13 +1794,8 @@ func (m *awsRestjson1_serializeOpSignOutUser) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/signOutUser") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1992,13 +1867,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2080,13 +1950,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/tags/{ResourceArn}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "DELETE" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2149,13 +2014,8 @@ func (m *awsRestjson1_serializeOpUpdateAuditStreamConfiguration) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/updateAuditStreamConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2227,13 +2087,8 @@ func (m *awsRestjson1_serializeOpUpdateCompanyNetworkConfiguration) HandleSerial } opPath, opQuery := httpbinding.SplitURI("/updateCompanyNetworkConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2319,13 +2174,8 @@ func (m *awsRestjson1_serializeOpUpdateDevicePolicyConfiguration) HandleSerializ } opPath, opQuery := httpbinding.SplitURI("/updateDevicePolicyConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2397,13 +2247,8 @@ func (m *awsRestjson1_serializeOpUpdateDomainMetadata) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/updateDomainMetadata") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2480,13 +2325,8 @@ func (m *awsRestjson1_serializeOpUpdateFleetMetadata) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/UpdateFleetMetadata") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2563,13 +2403,8 @@ func (m *awsRestjson1_serializeOpUpdateIdentityProviderConfiguration) HandleSeri } opPath, opQuery := httpbinding.SplitURI("/updateIdentityProviderConfiguration") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/workmailmessageflow/go.mod b/service/workmailmessageflow/go.mod index 9e62276b982..bf8d95edc65 100644 --- a/service/workmailmessageflow/go.mod +++ b/service/workmailmessageflow/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/workmailmessageflow/go.sum b/service/workmailmessageflow/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/workmailmessageflow/go.sum +++ b/service/workmailmessageflow/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/workmailmessageflow/serializers.go b/service/workmailmessageflow/serializers.go index 90088f7bec9..e06d3b353b5 100644 --- a/service/workmailmessageflow/serializers.go +++ b/service/workmailmessageflow/serializers.go @@ -36,13 +36,8 @@ func (m *awsRestjson1_serializeOpGetRawMessageContent) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/messages/{messageId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "GET" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -99,13 +94,8 @@ func (m *awsRestjson1_serializeOpPutRawMessageContent) HandleSerialize(ctx conte } opPath, opQuery := httpbinding.SplitURI("/messages/{messageId}") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { diff --git a/service/xray/go.mod b/service/xray/go.mod index 9177283f92d..d968529a069 100644 --- a/service/xray/go.mod +++ b/service/xray/go.mod @@ -4,7 +4,7 @@ go 1.15 require ( github.com/aws/aws-sdk-go-v2 v1.3.0 - github.com/aws/smithy-go v1.2.0 + github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a ) replace github.com/aws/aws-sdk-go-v2 => ../../ diff --git a/service/xray/go.sum b/service/xray/go.sum index c3783ae6011..d5fe43e1950 100644 --- a/service/xray/go.sum +++ b/service/xray/go.sum @@ -1,5 +1,6 @@ -github.com/aws/smithy-go v1.2.0 h1:0PoGBWXkXDIyVdPaZW9gMhaGzj3UOAgTdiVoHuuZAFA= github.com/aws/smithy-go v1.2.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a h1:sstpjU3aHqiGjLAw288qo4AwCw3w3RkqX8OwP0aa/Co= +github.com/aws/smithy-go v1.2.1-0.20210330191137-b290458ce30a/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= diff --git a/service/xray/serializers.go b/service/xray/serializers.go index 25824b658d4..d2060374e79 100644 --- a/service/xray/serializers.go +++ b/service/xray/serializers.go @@ -37,13 +37,8 @@ func (m *awsRestjson1_serializeOpBatchGetTraces) HandleSerialize(ctx context.Con } opPath, opQuery := httpbinding.SplitURI("/Traces") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -117,13 +112,8 @@ func (m *awsRestjson1_serializeOpCreateGroup) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/CreateGroup") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -209,13 +199,8 @@ func (m *awsRestjson1_serializeOpCreateSamplingRule) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/CreateSamplingRule") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -291,13 +276,8 @@ func (m *awsRestjson1_serializeOpDeleteGroup) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/DeleteGroup") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -369,13 +349,8 @@ func (m *awsRestjson1_serializeOpDeleteSamplingRule) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/DeleteSamplingRule") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -447,13 +422,8 @@ func (m *awsRestjson1_serializeOpGetEncryptionConfig) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/EncryptionConfig") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -497,13 +467,8 @@ func (m *awsRestjson1_serializeOpGetGroup) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/GetGroup") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -575,13 +540,8 @@ func (m *awsRestjson1_serializeOpGetGroups) HandleSerialize(ctx context.Context, } opPath, opQuery := httpbinding.SplitURI("/Groups") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -648,13 +608,8 @@ func (m *awsRestjson1_serializeOpGetInsight) HandleSerialize(ctx context.Context } opPath, opQuery := httpbinding.SplitURI("/Insight") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -721,13 +676,8 @@ func (m *awsRestjson1_serializeOpGetInsightEvents) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/InsightEvents") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -804,13 +754,8 @@ func (m *awsRestjson1_serializeOpGetInsightImpactGraph) HandleSerialize(ctx cont } opPath, opQuery := httpbinding.SplitURI("/InsightImpactGraph") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -892,13 +837,8 @@ func (m *awsRestjson1_serializeOpGetInsightSummaries) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/InsightSummaries") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -997,13 +937,8 @@ func (m *awsRestjson1_serializeOpGetSamplingRules) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/GetSamplingRules") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1070,13 +1005,8 @@ func (m *awsRestjson1_serializeOpGetSamplingStatisticSummaries) HandleSerialize( } opPath, opQuery := httpbinding.SplitURI("/SamplingStatisticSummaries") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1143,13 +1073,8 @@ func (m *awsRestjson1_serializeOpGetSamplingTargets) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/SamplingTargets") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1218,13 +1143,8 @@ func (m *awsRestjson1_serializeOpGetServiceGraph) HandleSerialize(ctx context.Co } opPath, opQuery := httpbinding.SplitURI("/ServiceGraph") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1311,13 +1231,8 @@ func (m *awsRestjson1_serializeOpGetTimeSeriesServiceStatistics) HandleSerialize } opPath, opQuery := httpbinding.SplitURI("/TimeSeriesServiceStatistics") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1419,13 +1334,8 @@ func (m *awsRestjson1_serializeOpGetTraceGraph) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/TraceGraph") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1499,13 +1409,8 @@ func (m *awsRestjson1_serializeOpGetTraceSummaries) HandleSerialize(ctx context. } opPath, opQuery := httpbinding.SplitURI("/TraceSummaries") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1604,13 +1509,8 @@ func (m *awsRestjson1_serializeOpListTagsForResource) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/ListTagsForResource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1682,13 +1582,8 @@ func (m *awsRestjson1_serializeOpPutEncryptionConfig) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/PutEncryptionConfig") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1760,13 +1655,8 @@ func (m *awsRestjson1_serializeOpPutTelemetryRecords) HandleSerialize(ctx contex } opPath, opQuery := httpbinding.SplitURI("/TelemetryRecords") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1850,13 +1740,8 @@ func (m *awsRestjson1_serializeOpPutTraceSegments) HandleSerialize(ctx context.C } opPath, opQuery := httpbinding.SplitURI("/TraceSegments") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -1925,13 +1810,8 @@ func (m *awsRestjson1_serializeOpTagResource) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/TagResource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2005,13 +1885,8 @@ func (m *awsRestjson1_serializeOpUntagResource) HandleSerialize(ctx context.Cont } opPath, opQuery := httpbinding.SplitURI("/UntagResource") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2085,13 +1960,8 @@ func (m *awsRestjson1_serializeOpUpdateGroup) HandleSerialize(ctx context.Contex } opPath, opQuery := httpbinding.SplitURI("/UpdateGroup") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil { @@ -2175,13 +2045,8 @@ func (m *awsRestjson1_serializeOpUpdateSamplingRule) HandleSerialize(ctx context } opPath, opQuery := httpbinding.SplitURI("/UpdateSamplingRule") - request.URL.Path = opPath - if len(request.URL.RawQuery) > 0 { - request.URL.RawQuery = "&" + opQuery - } else { - request.URL.RawQuery = opQuery - } - + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) request.Method = "POST" restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) if err != nil {