From b44973504a1649af0b4bb361c0dbb69053a17572 Mon Sep 17 00:00:00 2001 From: AWS SDK for Go v2 automation user Date: Tue, 13 Dec 2022 19:20:43 +0000 Subject: [PATCH] Regenerated Clients --- .../6fd48e42c23a4ce7ab7186adc3bb9028.json | 8 +++ .../71ba70b6f89a4b45aba345246828c814.json | 8 +++ service/cloudtrail/deserializers.go | 42 +++++++++++ .../guardduty/internal/endpoints/endpoints.go | 3 + .../deserializers.go | 41 ++++------- .../generated.json | 1 - .../types/types.go | 69 ++++--------------- .../types/types_exported_test.go | 38 ---------- service/rbin/internal/endpoints/endpoints.go | 3 + service/rds/deserializers.go | 13 ++++ service/rds/serializers.go | 5 ++ service/rds/types/enums.go | 22 ++++++ service/rds/types/types.go | 6 ++ 13 files changed, 139 insertions(+), 120 deletions(-) create mode 100644 .changelog/6fd48e42c23a4ce7ab7186adc3bb9028.json create mode 100644 .changelog/71ba70b6f89a4b45aba345246828c814.json delete mode 100644 service/marketplaceentitlementservice/types/types_exported_test.go diff --git a/.changelog/6fd48e42c23a4ce7ab7186adc3bb9028.json b/.changelog/6fd48e42c23a4ce7ab7186adc3bb9028.json new file mode 100644 index 00000000000..1fa41b9edea --- /dev/null +++ b/.changelog/6fd48e42c23a4ce7ab7186adc3bb9028.json @@ -0,0 +1,8 @@ +{ + "id": "6fd48e42-c23a-4ce7-ab71-86adc3bb9028", + "type": "feature", + "description": "Merging mainline branch for service model into mainline release branch. There are no new APIs.", + "modules": [ + "service/cloudtrail" + ] +} \ No newline at end of file diff --git a/.changelog/71ba70b6f89a4b45aba345246828c814.json b/.changelog/71ba70b6f89a4b45aba345246828c814.json new file mode 100644 index 00000000000..a34fe7c4228 --- /dev/null +++ b/.changelog/71ba70b6f89a4b45aba345246828c814.json @@ -0,0 +1,8 @@ +{ + "id": "71ba70b6-f89a-4b45-aba3-45246828c814", + "type": "feature", + "description": "This deployment adds ClientPasswordAuthType field to the Auth structure of the DBProxy.", + "modules": [ + "service/rds" + ] +} \ No newline at end of file diff --git a/service/cloudtrail/deserializers.go b/service/cloudtrail/deserializers.go index 8ebf7f42f3d..9bb023de2e2 100644 --- a/service/cloudtrail/deserializers.go +++ b/service/cloudtrail/deserializers.go @@ -421,6 +421,9 @@ func awsAwsjson11_deserializeOpErrorCreateEventDataStore(response *smithyhttp.Re case strings.EqualFold("InsufficientEncryptionPolicyException", errorCode): return awsAwsjson11_deserializeErrorInsufficientEncryptionPolicyException(response, errorBody) + case strings.EqualFold("InvalidEventSelectorsException", errorCode): + return awsAwsjson11_deserializeErrorInvalidEventSelectorsException(response, errorBody) + case strings.EqualFold("InvalidKmsKeyIdException", errorCode): return awsAwsjson11_deserializeErrorInvalidKmsKeyIdException(response, errorBody) @@ -643,6 +646,9 @@ func awsAwsjson11_deserializeOpErrorCreateTrail(response *smithyhttp.Response, m case strings.EqualFold("S3BucketDoesNotExistException", errorCode): return awsAwsjson11_deserializeErrorS3BucketDoesNotExistException(response, errorBody) + case strings.EqualFold("TagsLimitExceededException", errorCode): + return awsAwsjson11_deserializeErrorTagsLimitExceededException(response, errorBody) + case strings.EqualFold("TrailAlreadyExistsException", errorCode): return awsAwsjson11_deserializeErrorTrailAlreadyExistsException(response, errorBody) @@ -772,6 +778,9 @@ func awsAwsjson11_deserializeOpErrorDeleteEventDataStore(response *smithyhttp.Re case strings.EqualFold("EventDataStoreTerminationProtectedException", errorCode): return awsAwsjson11_deserializeErrorEventDataStoreTerminationProtectedException(response, errorBody) + case strings.EqualFold("InactiveEventDataStoreException", errorCode): + return awsAwsjson11_deserializeErrorInactiveEventDataStoreException(response, errorBody) + case strings.EqualFold("InsufficientDependencyServiceAccessPermissionException", errorCode): return awsAwsjson11_deserializeErrorInsufficientDependencyServiceAccessPermissionException(response, errorBody) @@ -898,6 +907,9 @@ func awsAwsjson11_deserializeOpErrorDeleteTrail(response *smithyhttp.Response, m } switch { + case strings.EqualFold("CloudTrailARNInvalidException", errorCode): + return awsAwsjson11_deserializeErrorCloudTrailARNInvalidException(response, errorBody) + case strings.EqualFold("ConflictException", errorCode): return awsAwsjson11_deserializeErrorConflictException(response, errorBody) @@ -1669,6 +1681,9 @@ func awsAwsjson11_deserializeOpErrorGetEventSelectors(response *smithyhttp.Respo } switch { + case strings.EqualFold("CloudTrailARNInvalidException", errorCode): + return awsAwsjson11_deserializeErrorCloudTrailARNInvalidException(response, errorBody) + case strings.EqualFold("InvalidTrailNameException", errorCode): return awsAwsjson11_deserializeErrorInvalidTrailNameException(response, errorBody) @@ -1912,6 +1927,9 @@ func awsAwsjson11_deserializeOpErrorGetInsightSelectors(response *smithyhttp.Res } switch { + case strings.EqualFold("CloudTrailARNInvalidException", errorCode): + return awsAwsjson11_deserializeErrorCloudTrailARNInvalidException(response, errorBody) + case strings.EqualFold("InsightNotEnabledException", errorCode): return awsAwsjson11_deserializeErrorInsightNotEnabledException(response, errorBody) @@ -2179,6 +2197,9 @@ func awsAwsjson11_deserializeOpErrorGetTrail(response *smithyhttp.Response, meta } switch { + case strings.EqualFold("CloudTrailARNInvalidException", errorCode): + return awsAwsjson11_deserializeErrorCloudTrailARNInvalidException(response, errorBody) + case strings.EqualFold("InvalidTrailNameException", errorCode): return awsAwsjson11_deserializeErrorInvalidTrailNameException(response, errorBody) @@ -2299,6 +2320,9 @@ func awsAwsjson11_deserializeOpErrorGetTrailStatus(response *smithyhttp.Response } switch { + case strings.EqualFold("CloudTrailARNInvalidException", errorCode): + return awsAwsjson11_deserializeErrorCloudTrailARNInvalidException(response, errorBody) + case strings.EqualFold("InvalidTrailNameException", errorCode): return awsAwsjson11_deserializeErrorInvalidTrailNameException(response, errorBody) @@ -3541,6 +3565,9 @@ func awsAwsjson11_deserializeOpErrorPutEventSelectors(response *smithyhttp.Respo } switch { + case strings.EqualFold("CloudTrailARNInvalidException", errorCode): + return awsAwsjson11_deserializeErrorCloudTrailARNInvalidException(response, errorBody) + case strings.EqualFold("InsufficientDependencyServiceAccessPermissionException", errorCode): return awsAwsjson11_deserializeErrorInsufficientDependencyServiceAccessPermissionException(response, errorBody) @@ -3676,6 +3703,9 @@ func awsAwsjson11_deserializeOpErrorPutInsightSelectors(response *smithyhttp.Res } switch { + case strings.EqualFold("CloudTrailARNInvalidException", errorCode): + return awsAwsjson11_deserializeErrorCloudTrailARNInvalidException(response, errorBody) + case strings.EqualFold("InsufficientEncryptionPolicyException", errorCode): return awsAwsjson11_deserializeErrorInsufficientEncryptionPolicyException(response, errorBody) @@ -4393,6 +4423,9 @@ func awsAwsjson11_deserializeOpErrorStartLogging(response *smithyhttp.Response, } switch { + case strings.EqualFold("CloudTrailARNInvalidException", errorCode): + return awsAwsjson11_deserializeErrorCloudTrailARNInvalidException(response, errorBody) + case strings.EqualFold("InsufficientDependencyServiceAccessPermissionException", errorCode): return awsAwsjson11_deserializeErrorInsufficientDependencyServiceAccessPermissionException(response, errorBody) @@ -4795,6 +4828,9 @@ func awsAwsjson11_deserializeOpErrorStopLogging(response *smithyhttp.Response, m } switch { + case strings.EqualFold("CloudTrailARNInvalidException", errorCode): + return awsAwsjson11_deserializeErrorCloudTrailARNInvalidException(response, errorBody) + case strings.EqualFold("InsufficientDependencyServiceAccessPermissionException", errorCode): return awsAwsjson11_deserializeErrorInsufficientDependencyServiceAccessPermissionException(response, errorBody) @@ -4948,6 +4984,9 @@ func awsAwsjson11_deserializeOpErrorUpdateEventDataStore(response *smithyhttp.Re case strings.EqualFold("InsufficientEncryptionPolicyException", errorCode): return awsAwsjson11_deserializeErrorInsufficientEncryptionPolicyException(response, errorBody) + case strings.EqualFold("InvalidEventSelectorsException", errorCode): + return awsAwsjson11_deserializeErrorInvalidEventSelectorsException(response, errorBody) + case strings.EqualFold("InvalidKmsKeyIdException", errorCode): return awsAwsjson11_deserializeErrorInvalidKmsKeyIdException(response, errorBody) @@ -5086,6 +5125,9 @@ func awsAwsjson11_deserializeOpErrorUpdateTrail(response *smithyhttp.Response, m } switch { + case strings.EqualFold("CloudTrailARNInvalidException", errorCode): + return awsAwsjson11_deserializeErrorCloudTrailARNInvalidException(response, errorBody) + case strings.EqualFold("CloudTrailAccessNotEnabledException", errorCode): return awsAwsjson11_deserializeErrorCloudTrailAccessNotEnabledException(response, errorBody) diff --git a/service/guardduty/internal/endpoints/endpoints.go b/service/guardduty/internal/endpoints/endpoints.go index 74f24354f7f..2d1e7c1c3ee 100644 --- a/service/guardduty/internal/endpoints/endpoints.go +++ b/service/guardduty/internal/endpoints/endpoints.go @@ -168,6 +168,9 @@ var defaultPartitions = endpoints.Partitions{ endpoints.EndpointKey{ Region: "eu-central-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "eu-central-2", + }: endpoints.Endpoint{}, endpoints.EndpointKey{ Region: "eu-north-1", }: endpoints.Endpoint{}, diff --git a/service/marketplaceentitlementservice/deserializers.go b/service/marketplaceentitlementservice/deserializers.go index 0944ad752a1..43105adb094 100644 --- a/service/marketplaceentitlementservice/deserializers.go +++ b/service/marketplaceentitlementservice/deserializers.go @@ -355,7 +355,7 @@ func awsAwsjson11_deserializeDocumentEntitlementList(v *[]types.Entitlement, val return nil } -func awsAwsjson11_deserializeDocumentEntitlementValue(v *types.EntitlementValue, value interface{}) error { +func awsAwsjson11_deserializeDocumentEntitlementValue(v **types.EntitlementValue, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) } @@ -368,27 +368,25 @@ func awsAwsjson11_deserializeDocumentEntitlementValue(v *types.EntitlementValue, return fmt.Errorf("unexpected JSON type %v", value) } - var uv types.EntitlementValue -loop: + var sv *types.EntitlementValue + if *v == nil { + sv = &types.EntitlementValue{} + } else { + sv = *v + } + for key, value := range shape { - if value == nil { - continue - } switch key { case "BooleanValue": - var mv bool if value != nil { jtv, ok := value.(bool) if !ok { return fmt.Errorf("expected Boolean to be of type *bool, got %T instead", value) } - mv = jtv + sv.BooleanValue = ptr.Bool(jtv) } - uv = &types.EntitlementValueMemberBooleanValue{Value: mv} - break loop case "DoubleValue": - var mv float64 if value != nil { switch jtv := value.(type) { case json.Number: @@ -396,7 +394,7 @@ loop: if err != nil { return err } - mv = f64 + sv.DoubleValue = ptr.Float64(f64) case string: var f64 float64 @@ -414,18 +412,15 @@ loop: return fmt.Errorf("unknown JSON number value: %s", jtv) } - mv = f64 + sv.DoubleValue = ptr.Float64(f64) default: return fmt.Errorf("expected Double to be a JSON Number, got %T instead", value) } } - uv = &types.EntitlementValueMemberDoubleValue{Value: mv} - break loop case "IntegerValue": - var mv int32 if value != nil { jtv, ok := value.(json.Number) if !ok { @@ -435,30 +430,24 @@ loop: if err != nil { return err } - mv = int32(i64) + sv.IntegerValue = ptr.Int32(int32(i64)) } - uv = &types.EntitlementValueMemberIntegerValue{Value: mv} - break loop case "StringValue": - var mv string if value != nil { jtv, ok := value.(string) if !ok { return fmt.Errorf("expected String to be of type string, got %T instead", value) } - mv = jtv + sv.StringValue = ptr.String(jtv) } - uv = &types.EntitlementValueMemberStringValue{Value: mv} - break loop default: - uv = &types.UnknownUnionMember{Tag: key} - break loop + _, _ = key, value } } - *v = uv + *v = sv return nil } diff --git a/service/marketplaceentitlementservice/generated.json b/service/marketplaceentitlementservice/generated.json index 4a8620eb5b3..05e509970a3 100644 --- a/service/marketplaceentitlementservice/generated.json +++ b/service/marketplaceentitlementservice/generated.json @@ -20,7 +20,6 @@ "types/enums.go", "types/errors.go", "types/types.go", - "types/types_exported_test.go", "validators.go" ], "go": "1.15", diff --git a/service/marketplaceentitlementservice/types/types.go b/service/marketplaceentitlementservice/types/types.go index 5768892e5bd..a526c1662a6 100644 --- a/service/marketplaceentitlementservice/types/types.go +++ b/service/marketplaceentitlementservice/types/types.go @@ -35,73 +35,32 @@ type Entitlement struct { // The EntitlementValue represents the amount of capacity that the customer is // entitled to for the product. - Value EntitlementValue + Value *EntitlementValue noSmithyDocumentSerde } // The EntitlementValue represents the amount of capacity that the customer is // entitled to for the product. -// -// The following types satisfy this interface: -// -// EntitlementValueMemberBooleanValue -// EntitlementValueMemberDoubleValue -// EntitlementValueMemberIntegerValue -// EntitlementValueMemberStringValue -type EntitlementValue interface { - isEntitlementValue() -} - -// The BooleanValue field will be populated with a boolean value when the -// entitlement is a boolean type. Otherwise, the field will not be set. -type EntitlementValueMemberBooleanValue struct { - Value bool - - noSmithyDocumentSerde -} +type EntitlementValue struct { -func (*EntitlementValueMemberBooleanValue) isEntitlementValue() {} + // The BooleanValue field will be populated with a boolean value when the + // entitlement is a boolean type. Otherwise, the field will not be set. + BooleanValue *bool -// The DoubleValue field will be populated with a double value when the entitlement -// is a double type. Otherwise, the field will not be set. -type EntitlementValueMemberDoubleValue struct { - Value float64 + // The DoubleValue field will be populated with a double value when the entitlement + // is a double type. Otherwise, the field will not be set. + DoubleValue *float64 - noSmithyDocumentSerde -} - -func (*EntitlementValueMemberDoubleValue) isEntitlementValue() {} + // The IntegerValue field will be populated with an integer value when the + // entitlement is an integer type. Otherwise, the field will not be set. + IntegerValue *int32 -// The IntegerValue field will be populated with an integer value when the -// entitlement is an integer type. Otherwise, the field will not be set. -type EntitlementValueMemberIntegerValue struct { - Value int32 + // The StringValue field will be populated with a string value when the entitlement + // is a string type. Otherwise, the field will not be set. + StringValue *string noSmithyDocumentSerde } -func (*EntitlementValueMemberIntegerValue) isEntitlementValue() {} - -// The StringValue field will be populated with a string value when the entitlement -// is a string type. Otherwise, the field will not be set. -type EntitlementValueMemberStringValue struct { - Value string - - noSmithyDocumentSerde -} - -func (*EntitlementValueMemberStringValue) isEntitlementValue() {} - type noSmithyDocumentSerde = smithydocument.NoSerde - -// UnknownUnionMember is returned when a union member is returned over the wire, -// but has an unknown tag. -type UnknownUnionMember struct { - Tag string - Value []byte - - noSmithyDocumentSerde -} - -func (*UnknownUnionMember) isEntitlementValue() {} diff --git a/service/marketplaceentitlementservice/types/types_exported_test.go b/service/marketplaceentitlementservice/types/types_exported_test.go deleted file mode 100644 index e01ca925f27..00000000000 --- a/service/marketplaceentitlementservice/types/types_exported_test.go +++ /dev/null @@ -1,38 +0,0 @@ -// Code generated by smithy-go-codegen DO NOT EDIT. - -package types_test - -import ( - "fmt" - "github.com/aws/aws-sdk-go-v2/service/marketplaceentitlementservice/types" -) - -func ExampleEntitlementValue_outputUsage() { - var union types.EntitlementValue - // type switches can be used to check the union value - switch v := union.(type) { - case *types.EntitlementValueMemberBooleanValue: - _ = v.Value // Value is bool - - case *types.EntitlementValueMemberDoubleValue: - _ = v.Value // Value is float64 - - case *types.EntitlementValueMemberIntegerValue: - _ = v.Value // Value is int32 - - case *types.EntitlementValueMemberStringValue: - _ = v.Value // Value is string - - case *types.UnknownUnionMember: - fmt.Println("unknown tag:", v.Tag) - - default: - fmt.Println("union is nil or unknown type") - - } -} - -var _ *string -var _ *int32 -var _ *bool -var _ *float64 diff --git a/service/rbin/internal/endpoints/endpoints.go b/service/rbin/internal/endpoints/endpoints.go index e9795478da1..8de6ab554f8 100644 --- a/service/rbin/internal/endpoints/endpoints.go +++ b/service/rbin/internal/endpoints/endpoints.go @@ -153,6 +153,9 @@ var defaultPartitions = endpoints.Partitions{ endpoints.EndpointKey{ Region: "ap-south-1", }: endpoints.Endpoint{}, + endpoints.EndpointKey{ + Region: "ap-south-2", + }: endpoints.Endpoint{}, endpoints.EndpointKey{ Region: "ap-southeast-1", }: endpoints.Endpoint{}, diff --git a/service/rds/deserializers.go b/service/rds/deserializers.go index 19217084582..1c3baa2fb2b 100644 --- a/service/rds/deserializers.go +++ b/service/rds/deserializers.go @@ -45218,6 +45218,19 @@ func awsAwsquery_deserializeDocumentUserAuthConfigInfo(v **types.UserAuthConfigI sv.AuthScheme = types.AuthScheme(xtv) } + case strings.EqualFold("ClientPasswordAuthType", t.Name.Local): + val, err := decoder.Value() + if err != nil { + return err + } + if val == nil { + break + } + { + xtv := string(val) + sv.ClientPasswordAuthType = types.ClientPasswordAuthType(xtv) + } + case strings.EqualFold("Description", t.Name.Local): val, err := decoder.Value() if err != nil { diff --git a/service/rds/serializers.go b/service/rds/serializers.go index 8a3dff942f6..73dd59e27f9 100644 --- a/service/rds/serializers.go +++ b/service/rds/serializers.go @@ -9638,6 +9638,11 @@ func awsAwsquery_serializeDocumentUserAuthConfig(v *types.UserAuthConfig, value objectKey.String(string(v.AuthScheme)) } + if len(v.ClientPasswordAuthType) > 0 { + objectKey := object.Key("ClientPasswordAuthType") + objectKey.String(string(v.ClientPasswordAuthType)) + } + if v.Description != nil { objectKey := object.Key("Description") objectKey.String(*v.Description) diff --git a/service/rds/types/enums.go b/service/rds/types/enums.go index 02e30256f3d..378a0aa8c7a 100644 --- a/service/rds/types/enums.go +++ b/service/rds/types/enums.go @@ -134,6 +134,28 @@ func (AutomationMode) Values() []AutomationMode { } } +type ClientPasswordAuthType string + +// Enum values for ClientPasswordAuthType +const ( + ClientPasswordAuthTypeMysqlNativePassword ClientPasswordAuthType = "MYSQL_NATIVE_PASSWORD" + ClientPasswordAuthTypePostgresScramSha256 ClientPasswordAuthType = "POSTGRES_SCRAM_SHA_256" + ClientPasswordAuthTypePostgresMd5 ClientPasswordAuthType = "POSTGRES_MD5" + ClientPasswordAuthTypeSqlServerAuthentication ClientPasswordAuthType = "SQL_SERVER_AUTHENTICATION" +) + +// Values returns all known values for ClientPasswordAuthType. Note that this can +// be expanded in the future, and so it is only as up to date as the client. The +// ordering of this slice is not guaranteed to be stable across updates. +func (ClientPasswordAuthType) Values() []ClientPasswordAuthType { + return []ClientPasswordAuthType{ + "MYSQL_NATIVE_PASSWORD", + "POSTGRES_SCRAM_SHA_256", + "POSTGRES_MD5", + "SQL_SERVER_AUTHENTICATION", + } +} + type CustomEngineVersionStatus string // Enum values for CustomEngineVersionStatus diff --git a/service/rds/types/types.go b/service/rds/types/types.go index e639455c6b2..b995cba607d 100644 --- a/service/rds/types/types.go +++ b/service/rds/types/types.go @@ -3861,6 +3861,9 @@ type UserAuthConfig struct { // the underlying database. AuthScheme AuthScheme + // The type of authentication the proxy uses for connections from clients. + ClientPasswordAuthType ClientPasswordAuthType + // A user-specified description about the authentication used by a proxy to log in // as a specific database user. Description *string @@ -3889,6 +3892,9 @@ type UserAuthConfigInfo struct { // the underlying database. AuthScheme AuthScheme + // The type of authentication the proxy uses for connections from clients. + ClientPasswordAuthType ClientPasswordAuthType + // A user-specified description about the authentication used by a proxy to log in // as a specific database user. Description *string