From 3a8ba5eae1d5246ab4a835a1ca4b4dc4a94d1fd1 Mon Sep 17 00:00:00 2001 From: Jason Del Ponte <961963+jasdel@users.noreply.github.com> Date: Fri, 24 Sep 2021 14:36:26 -0700 Subject: [PATCH] Update API models and regenerate clients (#1435) Updates the SDK's API models and regenerate API clients. --- .../efee176af95c4ef48d8250d01d0af042.json | 33 + .../aws-models/appsync.2017-07-25.json | 94 +- .../aws-models/comprehend.2017-11-27.json | 340 ++++++- .../databasemigrationservice.2016-01-01.json | 22 +- .../aws-models/ec2.2016-11-15.json | 492 +++++++--- .../aws-models/ecr.2015-09-21.json | 228 ++++- .../elasticsearchservice.2015-01-01.json | 64 +- .../aws-models/iam.2010-05-08.json | 106 +-- .../aws-models/imagebuilder.2019-12-02.json | 161 +++- .../aws-models/iot.2015-05-28.json | 144 ++- .../aws-models/lexmodelsv2.2020-08-07.json | 486 +++++++++- .../aws-models/licensemanager.2018-08-01.json | 470 +++++++++- .../aws-models/mediaconvert.2017-08-29.json | 524 ++++++++++- .../mediapackagevod.2018-11-07.json | 7 + .../aws-models/mediatailor.2018-04-23.json | 94 +- .../aws-models/opensearch.2021-01-01.json | 52 +- .../aws-models/ssm.2014-11-06.json | 83 +- .../aws-models/wafv2.2019-07-29.json | 41 +- .../aws/go/codegen/endpoint-prefix.json | 1 + .../smithy/aws/go/codegen/endpoints.json | 98 ++ .../appmesh/internal/endpoints/endpoints.go | 4 + service/appsync/api_op_CreateDataSource.go | 8 +- service/appsync/api_op_CreateGraphqlApi.go | 6 +- service/appsync/api_op_UpdateDataSource.go | 8 +- service/appsync/api_op_UpdateGraphqlApi.go | 2 +- service/appsync/deserializers.go | 54 ++ service/appsync/serializers.go | 31 + service/appsync/types/enums.go | 14 +- service/appsync/types/types.go | 56 +- service/appsync/validators.go | 28 + .../internal/endpoints/endpoints.go | 14 + .../internal/endpoints/endpoints.go | 1 + .../api_op_CreateDocumentClassifier.go | 6 + .../api_op_CreateEntityRecognizer.go | 6 + .../api_op_ListDocumentClassifierSummaries.go | 212 +++++ .../api_op_ListEntityRecognizerSummaries.go | 212 +++++ service/comprehend/api_op_UpdateEndpoint.go | 17 +- service/comprehend/deserializers.go | 685 +++++++++++++- service/comprehend/generated.json | 2 + service/comprehend/serializers.go | 183 ++++ service/comprehend/types/enums.go | 18 + service/comprehend/types/types.go | 94 ++ service/comprehend/validators.go | 3 - .../api_op_ApplyPendingMaintenanceAction.go | 3 +- .../api_op_CreateEndpoint.go | 4 +- .../api_op_CreateReplicationSubnetGroup.go | 5 +- .../api_op_ModifyEndpoint.go | 10 +- .../api_op_RebootReplicationInstance.go | 10 +- .../api_op_ReloadTables.go | 4 +- .../databasemigrationservice/serializers.go | 5 + .../databasemigrationservice/types/types.go | 9 +- .../api_op_AssociateClientVpnTargetNetwork.go | 2 +- service/ec2/api_op_AttachVpnGateway.go | 6 +- .../ec2/api_op_AuthorizeClientVpnIngress.go | 4 +- service/ec2/api_op_CreateClientVpnEndpoint.go | 10 +- service/ec2/api_op_CreateClientVpnRoute.go | 9 +- service/ec2/api_op_CreateCustomerGateway.go | 41 +- service/ec2/api_op_CreateVpnConnection.go | 6 +- .../ec2/api_op_CreateVpnConnectionRoute.go | 6 +- service/ec2/api_op_CreateVpnGateway.go | 6 +- service/ec2/api_op_DeleteVpnConnection.go | 6 +- .../ec2/api_op_DescribeCustomerGateways.go | 6 +- service/ec2/api_op_DescribeVpnConnections.go | 7 +- service/ec2/api_op_DescribeVpnGateways.go | 6 +- ...tVpnConnectionDeviceSampleConfiguration.go | 137 +++ .../ec2/api_op_GetVpnConnectionDeviceTypes.go | 243 +++++ ...lientVpnClientCertificateRevocationList.go | 2 +- service/ec2/api_op_ModifyClientVpnEndpoint.go | 6 +- service/ec2/api_op_ModifyInstancePlacement.go | 7 +- service/ec2/api_op_ModifyVpnConnection.go | 61 +- .../ec2/api_op_ModifyVpnConnectionOptions.go | 13 +- .../ec2/api_op_ModifyVpnTunnelCertificate.go | 2 +- service/ec2/api_op_ModifyVpnTunnelOptions.go | 14 +- service/ec2/deserializers.go | 485 ++++++++++ service/ec2/generated.json | 2 + service/ec2/serializers.go | 161 ++++ service/ec2/types/types.go | 101 ++- service/ec2/validators.go | 42 + service/ecr/api_op_CreateRepository.go | 4 + .../api_op_DescribeImageReplicationStatus.go | 136 +++ .../ecr/api_op_DescribeImageScanFindings.go | 4 +- service/ecr/api_op_StartImageScan.go | 4 +- service/ecr/deserializers.go | 371 ++++++++ service/ecr/generated.json | 1 + service/ecr/serializers.go | 113 +++ service/ecr/types/enums.go | 36 + service/ecr/types/types.go | 67 +- service/ecr/validators.go | 82 ++ .../api_op_ListDomainNames.go | 12 +- service/elasticsearchservice/deserializers.go | 9 + service/elasticsearchservice/serializers.go | 8 + service/elasticsearchservice/types/enums.go | 18 + service/elasticsearchservice/types/types.go | 9 +- service/iam/api_op_ChangePassword.go | 29 +- service/iam/api_op_CreateAccessKey.go | 19 +- service/iam/api_op_CreateAccountAlias.go | 5 +- service/iam/api_op_CreateLoginProfile.go | 17 +- .../iam/api_op_CreateOpenIDConnectProvider.go | 19 +- service/iam/api_op_CreatePolicy.go | 11 +- service/iam/api_op_CreateRole.go | 9 +- service/iam/api_op_CreateSAMLProvider.go | 18 +- service/iam/api_op_CreateUser.go | 4 +- service/iam/api_op_CreateVirtualMFADevice.go | 8 +- service/iam/api_op_DeleteAccessKey.go | 6 +- service/iam/api_op_DeleteAccountAlias.go | 5 +- .../iam/api_op_DeleteAccountPasswordPolicy.go | 3 +- service/iam/api_op_DeleteLoginProfile.go | 19 +- .../iam/api_op_DeleteSigningCertificate.go | 6 +- service/iam/api_op_DeleteUser.go | 7 +- .../iam/api_op_GenerateCredentialReport.go | 4 +- ...pi_op_GenerateOrganizationsAccessReport.go | 14 +- ...i_op_GenerateServiceLastAccessedDetails.go | 14 +- .../iam/api_op_GetAccountPasswordPolicy.go | 8 +- service/iam/api_op_GetCredentialReport.go | 4 +- service/iam/api_op_GetLoginProfile.go | 18 +- .../iam/api_op_GetOpenIDConnectProvider.go | 2 +- service/iam/api_op_ListAccessKeys.go | 9 +- service/iam/api_op_ListAccountAliases.go | 9 +- .../iam/api_op_ListOpenIDConnectProviders.go | 12 +- service/iam/api_op_ListPolicies.go | 21 +- service/iam/api_op_ListSigningCertificates.go | 7 +- service/iam/api_op_ListUsers.go | 12 +- service/iam/api_op_ListVirtualMFADevices.go | 16 +- ...i_op_SetSecurityTokenServicePreferences.go | 32 +- service/iam/api_op_SimulateCustomPolicy.go | 14 +- service/iam/api_op_SimulatePrincipalPolicy.go | 18 +- service/iam/api_op_UpdateAccessKey.go | 9 +- .../iam/api_op_UpdateAccountPasswordPolicy.go | 26 +- service/iam/api_op_UpdateLoginProfile.go | 7 +- .../iam/api_op_UpdateSigningCertificate.go | 6 +- service/iam/api_op_UploadServerCertificate.go | 16 +- .../iam/api_op_UploadSigningCertificate.go | 13 +- service/iam/types/types.go | 28 +- .../internal/endpoints/endpoints.go | 9 + .../imagebuilder/api_op_CreateComponent.go | 8 +- .../api_op_CreateContainerRecipe.go | 8 +- .../imagebuilder/api_op_CreateImageRecipe.go | 8 +- ...pi_op_CreateInfrastructureConfiguration.go | 22 +- service/imagebuilder/api_op_DeleteImage.go | 25 +- .../imagebuilder/api_op_ImportComponent.go | 12 +- .../api_op_ListComponentBuildVersions.go | 12 +- service/imagebuilder/api_op_ListComponents.go | 12 +- .../imagebuilder/api_op_ListImagePackages.go | 2 +- service/imagebuilder/api_op_ListImages.go | 10 +- ...pi_op_UpdateInfrastructureConfiguration.go | 17 +- service/imagebuilder/deserializers.go | 130 +++ service/imagebuilder/serializers.go | 36 + service/imagebuilder/types/enums.go | 16 + service/imagebuilder/types/types.go | 155 ++-- service/iot/api_op_CreateAuditSuppression.go | 5 +- service/iot/api_op_ListActiveViolations.go | 3 + service/iot/api_op_ListViolationEvents.go | 3 + .../api_op_PutVerificationStateOnViolation.go | 126 +++ service/iot/deserializers.go | 125 +++ service/iot/generated.json | 1 + service/iot/serializers.go | 94 ++ service/iot/types/enums.go | 22 + service/iot/types/types.go | 36 +- service/iot/validators.go | 42 + .../iotevents/internal/endpoints/endpoints.go | 3 + .../internal/endpoints/endpoints.go | 18 + .../internal/endpoints/endpoints.go | 1 + .../lexmodelsv2/api_op_DeleteUtterances.go | 133 +++ .../api_op_ListAggregatedUtterances.go | 319 +++++++ service/lexmodelsv2/deserializers.go | 631 ++++++++++++- service/lexmodelsv2/generated.json | 2 + .../internal/endpoints/endpoints.go | 2 + service/lexmodelsv2/serializers.go | 273 ++++++ service/lexmodelsv2/types/enums.go | 75 ++ service/lexmodelsv2/types/errors.go | 19 +- service/lexmodelsv2/types/types.go | 129 +++ service/lexmodelsv2/validators.go | 188 ++++ .../internal/endpoints/endpoints.go | 2 + .../licensemanager/api_op_CheckoutLicense.go | 3 + service/licensemanager/api_op_CreateGrant.go | 2 +- .../api_op_CreateGrantVersion.go | 1 + ..._CreateLicenseConversionTaskForResource.go | 139 +++ ..._op_CreateLicenseManagerReportGenerator.go | 10 +- service/licensemanager/api_op_DeleteGrant.go | 1 + .../licensemanager/api_op_DeleteLicense.go | 2 +- ..._op_DeleteLicenseManagerReportGenerator.go | 8 +- .../api_op_GetLicenseConfiguration.go | 2 +- .../api_op_GetLicenseConversionTask.go | 147 +++ ...api_op_GetLicenseManagerReportGenerator.go | 7 +- .../api_op_GetServiceSettings.go | 6 +- .../api_op_ListLicenseConfigurations.go | 6 +- .../api_op_ListLicenseConversionTasks.go | 125 +++ ...i_op_ListLicenseManagerReportGenerators.go | 3 +- .../api_op_ListResourceInventory.go | 30 +- ..._op_UpdateLicenseManagerReportGenerator.go | 17 +- ..._UpdateLicenseSpecificationsForResource.go | 12 +- .../api_op_UpdateServiceSettings.go | 2 +- service/licensemanager/deserializers.go | 848 +++++++++++++++++- service/licensemanager/doc.go | 4 +- service/licensemanager/generated.json | 3 + service/licensemanager/serializers.go | 215 +++++ service/licensemanager/types/enums.go | 20 + service/licensemanager/types/errors.go | 4 +- service/licensemanager/types/types.go | 119 ++- service/licensemanager/validators.go | 84 ++ service/mediaconvert/deserializers.go | 465 ++++++++++ service/mediaconvert/serializers.go | 211 +++++ service/mediaconvert/types/enums.go | 209 +++++ service/mediaconvert/types/types.go | 203 ++++- service/mediapackagevod/deserializers.go | 9 + service/mediapackagevod/types/types.go | 5 + ...p_ConfigureLogsForPlaybackConfiguration.go | 137 +++ service/mediatailor/api_op_CreateChannel.go | 2 +- .../api_op_GetPlaybackConfiguration.go | 3 + .../api_op_PutPlaybackConfiguration.go | 3 + service/mediatailor/deserializers.go | 220 +++++ service/mediatailor/generated.json | 1 + service/mediatailor/serializers.go | 73 ++ service/mediatailor/types/types.go | 21 + service/mediatailor/validators.go | 39 + service/opensearch/api_op_ListDomainNames.go | 10 +- service/opensearch/deserializers.go | 9 + service/opensearch/serializers.go | 8 + service/opensearch/types/enums.go | 18 + service/opensearch/types/types.go | 8 + .../internal/endpoints/endpoints.go | 20 + .../ssm/api_op_AssociateOpsItemRelatedItem.go | 9 +- service/ssm/api_op_DescribeParameters.go | 5 +- .../api_op_DisassociateOpsItemRelatedItem.go | 10 +- service/ssm/api_op_GetCommandInvocation.go | 8 + .../ssm/api_op_GetMaintenanceWindowTask.go | 8 + service/ssm/api_op_GetParameterHistory.go | 5 +- service/ssm/api_op_GetParametersByPath.go | 6 +- service/ssm/api_op_ListOpsItemRelatedItems.go | 3 +- ...pi_op_RegisterTaskWithMaintenanceWindow.go | 22 + service/ssm/api_op_SendCommand.go | 9 +- .../ssm/api_op_UpdateMaintenanceWindowTask.go | 26 + service/ssm/api_op_UpdateServiceSetting.go | 34 +- service/ssm/deserializers.go | 27 + service/ssm/serializers.go | 10 + service/ssm/types/enums.go | 19 + service/ssm/types/types.go | 91 +- service/wafv2/deserializers.go | 55 ++ service/wafv2/serializers.go | 33 + service/wafv2/types/types.go | 31 + service/wafv2/validators.go | 34 + 241 files changed, 13540 insertions(+), 1156 deletions(-) create mode 100644 .changelog/efee176af95c4ef48d8250d01d0af042.json create mode 100644 service/comprehend/api_op_ListDocumentClassifierSummaries.go create mode 100644 service/comprehend/api_op_ListEntityRecognizerSummaries.go create mode 100644 service/ec2/api_op_GetVpnConnectionDeviceSampleConfiguration.go create mode 100644 service/ec2/api_op_GetVpnConnectionDeviceTypes.go create mode 100644 service/ecr/api_op_DescribeImageReplicationStatus.go create mode 100644 service/iot/api_op_PutVerificationStateOnViolation.go create mode 100644 service/lexmodelsv2/api_op_DeleteUtterances.go create mode 100644 service/lexmodelsv2/api_op_ListAggregatedUtterances.go create mode 100644 service/licensemanager/api_op_CreateLicenseConversionTaskForResource.go create mode 100644 service/licensemanager/api_op_GetLicenseConversionTask.go create mode 100644 service/licensemanager/api_op_ListLicenseConversionTasks.go create mode 100644 service/mediatailor/api_op_ConfigureLogsForPlaybackConfiguration.go diff --git a/.changelog/efee176af95c4ef48d8250d01d0af042.json b/.changelog/efee176af95c4ef48d8250d01d0af042.json new file mode 100644 index 00000000000..201199c998e --- /dev/null +++ b/.changelog/efee176af95c4ef48d8250d01d0af042.json @@ -0,0 +1,33 @@ +{ + "id": "efee176a-f95c-4ef4-8d82-50d01d0af042", + "type": "feature", + "description": "API client updated", + "modules": [ + "service/appmesh", + "service/appsync", + "service/auditmanager", + "service/codecommit", + "service/comprehend", + "service/databasemigrationservice", + "service/ec2", + "service/ecr", + "service/elasticsearchservice", + "service/iam", + "service/identitystore", + "service/imagebuilder", + "service/iot", + "service/iotevents", + "service/kafkaconnect", + "service/lakeformation", + "service/lexmodelsv2", + "service/lexruntimev2", + "service/licensemanager", + "service/mediaconvert", + "service/mediapackagevod", + "service/mediatailor", + "service/opensearch", + "service/quicksight", + "service/ssm", + "service/wafv2" + ] +} \ No newline at end of file diff --git a/codegen/sdk-codegen/aws-models/appsync.2017-07-25.json b/codegen/sdk-codegen/aws-models/appsync.2017-07-25.json index eb0dbef8fb4..c885c728bb4 100644 --- a/codegen/sdk-codegen/aws-models/appsync.2017-07-25.json +++ b/codegen/sdk-codegen/aws-models/appsync.2017-07-25.json @@ -169,7 +169,7 @@ "name": "appsync" }, "aws.protocols#restJson1": {}, - "smithy.api#documentation": "

AppSync provides API actions for creating and interacting with data sources using\n GraphQL from your application.

", + "smithy.api#documentation": "

AppSync provides API actions for creating and interacting with data\n sources using GraphQL from your application.

", "smithy.api#title": "AWS AppSync", "smithy.api#xmlNamespace": { "uri": "http://appsync.amazonaws.com" @@ -195,7 +195,7 @@ "authenticationType": { "target": "com.amazonaws.appsync#AuthenticationType", "traits": { - "smithy.api#documentation": "

The authentication type: API key, Identity and Access Management, OIDC, or Amazon Cognito user pools.

" + "smithy.api#documentation": "

The authentication type: API key, Identity and Access Management, OIDC, Amazon Cognito user\n pools, or Amazon Web Services Lambda.

" } }, "openIDConnectConfig": { @@ -213,7 +213,7 @@ "lambdaAuthorizerConfig": { "target": "com.amazonaws.appsync#LambdaAuthorizerConfig", "traits": { - "smithy.api#documentation": "

Configuration for AWS Lambda function authorization.

" + "smithy.api#documentation": "

Configuration for Amazon Web Services Lambda function authorization.

" } } }, @@ -404,12 +404,12 @@ "deletes": { "target": "com.amazonaws.appsync#Long", "traits": { - "smithy.api#documentation": "

The time after which the API key is deleted. The date is represented as seconds since the\n epoch, rounded down to the nearest hour.

" + "smithy.api#documentation": "

The time after which the API key is deleted. The date is represented as seconds since\n the epoch, rounded down to the nearest hour.

" } } }, "traits": { - "smithy.api#documentation": "

Describes an API key.

\n

Customers invoke AppSync GraphQL API operations with API keys as an identity\n mechanism. There are two key versions:

\n

\n da1: This version was introduced at launch in November\n 2017. These keys always expire after 7 days. Key expiration is managed by Amazon DynamoDB\n TTL. The keys ceased to be valid after February 21, 2018 and should not be used after that\n date.

\n \n

\n da2: This version was introduced in February 2018 when\n AppSync added support to extend key expiration.

\n " + "smithy.api#documentation": "

Describes an API key.

\n

Customers invoke AppSync GraphQL API operations with API keys as an\n identity mechanism. There are two key versions:

\n

\n da1: This version was introduced at launch in November\n 2017. These keys always expire after 7 days. Key expiration is managed by Amazon DynamoDB\n TTL. The keys ceased to be valid after February 21, 2018 and should not be used after that\n date.

\n \n

\n da2: This version was introduced in February 2018 when\n AppSync added support to extend key expiration.

\n " } }, "com.amazonaws.appsync#ApiKeyLimitExceededException": { @@ -907,7 +907,7 @@ "serviceRoleArn": { "target": "com.amazonaws.appsync#String", "traits": { - "smithy.api#documentation": "

The Identity and Access Management service role ARN for the data source. The system assumes this role when\n accessing the data source.

" + "smithy.api#documentation": "

The Identity and Access Management service role ARN for the data source. The system assumes this\n role when accessing the data source.

" } }, "dynamodbConfig": { @@ -925,7 +925,13 @@ "elasticsearchConfig": { "target": "com.amazonaws.appsync#ElasticsearchDataSourceConfig", "traits": { - "smithy.api#documentation": "

Amazon Elasticsearch Service settings.

" + "smithy.api#documentation": "

Amazon OpenSearch Service settings.

\n

As of September 2021, Amazon Elasticsearch service is Amazon OpenSearch Service. This\n configuration is deprecated. For new data sources, use CreateDataSourceRequest$openSearchServiceConfig to create an OpenSearch data source.

" + } + }, + "openSearchServiceConfig": { + "target": "com.amazonaws.appsync#OpenSearchServiceDataSourceConfig", + "traits": { + "smithy.api#documentation": "

Amazon OpenSearch Service settings.

" } }, "httpConfig": { @@ -1106,7 +1112,7 @@ "authenticationType": { "target": "com.amazonaws.appsync#AuthenticationType", "traits": { - "smithy.api#documentation": "

The authentication type: API key, Identity and Access Management, OIDC, or Amazon Cognito user pools.

", + "smithy.api#documentation": "

The authentication type: API key, Identity and Access Management, OIDC, Amazon Cognito user\n pools, or Amazon Web Services Lambda.

", "smithy.api#required": {} } }, @@ -1143,7 +1149,7 @@ "lambdaAuthorizerConfig": { "target": "com.amazonaws.appsync#LambdaAuthorizerConfig", "traits": { - "smithy.api#documentation": "

Configuration for AWS Lambda function authorization.

" + "smithy.api#documentation": "

Configuration for Amazon Web Services Lambda function authorization.

" } } } @@ -1367,13 +1373,13 @@ "type": { "target": "com.amazonaws.appsync#DataSourceType", "traits": { - "smithy.api#documentation": "

The type of the data source.

\n " + "smithy.api#documentation": "

The type of the data source.

\n " } }, "serviceRoleArn": { "target": "com.amazonaws.appsync#String", "traits": { - "smithy.api#documentation": "

The Identity and Access Management service role ARN for the data source. The system assumes this role when\n accessing the data source.

" + "smithy.api#documentation": "

The Identity and Access Management service role ARN for the data source. The system assumes this\n role when accessing the data source.

" } }, "dynamodbConfig": { @@ -1391,7 +1397,13 @@ "elasticsearchConfig": { "target": "com.amazonaws.appsync#ElasticsearchDataSourceConfig", "traits": { - "smithy.api#documentation": "

Amazon Elasticsearch Service settings.

" + "smithy.api#documentation": "

Amazon OpenSearch Service settings.

" + } + }, + "openSearchServiceConfig": { + "target": "com.amazonaws.appsync#OpenSearchServiceDataSourceConfig", + "traits": { + "smithy.api#documentation": "

Amazon OpenSearch Service settings.

" } }, "httpConfig": { @@ -1438,6 +1450,10 @@ { "value": "RELATIONAL_DATABASE", "name": "RELATIONAL_DATABASE" + }, + { + "value": "AMAZON_OPENSEARCH_SERVICE", + "name": "AMAZON_OPENSEARCH_SERVICE" } ] } @@ -1953,7 +1969,7 @@ } }, "traits": { - "smithy.api#documentation": "

Describes an Elasticsearch data source configuration.

" + "smithy.api#documentation": "

Describes an OpenSearch data source configuration.

\n

As of September 2021, Amazon Elasticsearch service is Amazon OpenSearch Service. This\n configuration is deprecated. For new data sources, use OpenSearchServiceDataSourceConfig to specify an OpenSearch data\n source.

" } }, "com.amazonaws.appsync#ErrorMessage": { @@ -2713,13 +2729,13 @@ "wafWebAclArn": { "target": "com.amazonaws.appsync#String", "traits": { - "smithy.api#documentation": "

The ARN of the WAF ACL associated with this\n GraphqlApi, if one exists.

" + "smithy.api#documentation": "

The ARN of the WAF ACL associated with this GraphqlApi,\n if one exists.

" } }, "lambdaAuthorizerConfig": { "target": "com.amazonaws.appsync#LambdaAuthorizerConfig", "traits": { - "smithy.api#documentation": "

\n

Configuration for AWS Lambda function authorization.

" + "smithy.api#documentation": "

Configuration for Amazon Web Services Lambda function authorization.

" } } }, @@ -2739,7 +2755,7 @@ "endpoint": { "target": "com.amazonaws.appsync#String", "traits": { - "smithy.api#documentation": "

The HTTP URL endpoint. You can either specify the domain name or IP, and port\n combination, and the URL scheme must be HTTP or HTTPS. If the port is not specified, AppSync uses the default port 80 for the HTTP endpoint and port 443 for HTTPS\n endpoints.

" + "smithy.api#documentation": "

The HTTP URL endpoint. You can either specify the domain name or IP, and port\n combination, and the URL scheme must be HTTP or HTTPS. If the port is not specified,\n AppSync uses the default port 80 for the HTTP endpoint and port 443 for\n HTTPS endpoints.

" } }, "authorizationConfig": { @@ -2772,25 +2788,25 @@ "authorizerResultTtlInSeconds": { "target": "com.amazonaws.appsync#TTL", "traits": { - "smithy.api#documentation": "

The number of seconds a response should be cached for. The default is 5 minutes (300 seconds).\n The Lambda function can override this by returning a\n ttlOverride key in its response. A value of 0 disables caching of\n responses.

" + "smithy.api#documentation": "

The number of seconds a response should be cached for. The default is 5 minutes (300\n seconds). The Lambda function can override this by returning a ttlOverride key\n in its response. A value of 0 disables caching of responses.

" } }, "authorizerUri": { "target": "com.amazonaws.appsync#String", "traits": { - "smithy.api#documentation": "

The ARN of the lambda function to be called for authorization. This may be a standard\n Lambda ARN, a version ARN (.../v3) or alias ARN.

\n

\n Note: This Lambda function must have the following resource-based\n policy assigned to it. When configuring Lambda authorizers in the Console, this is done for\n you. To do so with the AWS CLI, run the following:

\n

\n aws lambda add-permission --function-name \"arn:aws:lambda:us-east-2:111122223333:function:my-function\" --statement-id \"appsync\" --principal appsync.amazonaws.com --action lambda:InvokeFunction\n

", + "smithy.api#documentation": "

The ARN of the Lambda function to be called for authorization. This may be a standard\n Lambda ARN, a version ARN (.../v3) or alias ARN.

\n

\n Note: This Lambda function must have the following resource-based\n policy assigned to it. When configuring Lambda authorizers in the Console, this is done for\n you. To do so with the Amazon Web Services CLI, run the following:

\n

\n aws lambda add-permission --function-name\n \"arn:aws:lambda:us-east-2:111122223333:function:my-function\" --statement-id \"appsync\"\n --principal appsync.amazonaws.com --action lambda:InvokeFunction\n

", "smithy.api#required": {} } }, "identityValidationExpression": { "target": "com.amazonaws.appsync#String", "traits": { - "smithy.api#documentation": "

A regular expression for validation of tokens before the Lambda Function is called.

" + "smithy.api#documentation": "

A regular expression for validation of tokens before the Lambda function is\n called.

" } } }, "traits": { - "smithy.api#documentation": "

A LambdaAuthorizerConfig holds configuration on how to authorize AppSync API access when using\n the AWS_LAMBDA authorizer mode. Be aware that an AppSync API may have only one Lambda authorizer configured\n at a time.

" + "smithy.api#documentation": "

A LambdaAuthorizerConfig holds configuration on how to authorize AppSync\n API access when using the AWS_LAMBDA authorizer mode. Be aware that an AppSync\n API may have only one Lambda authorizer configured at a time.

" } }, "com.amazonaws.appsync#LambdaConflictHandlerConfig": { @@ -2858,7 +2874,7 @@ } ], "traits": { - "smithy.api#documentation": "

Lists the API keys for a given API.

\n \n

API keys are deleted automatically 60 days after they expire. However, they may\n still be included in the response until they have actually been deleted. You can safely\n call DeleteApiKey to manually delete a key before it's automatically\n deleted.

\n ", + "smithy.api#documentation": "

Lists the API keys for a given API.

\n \n

API keys are deleted automatically 60 days after they expire. However, they may still\n be included in the response until they have actually been deleted. You can safely call\n DeleteApiKey to manually delete a key before it's automatically\n deleted.

\n ", "smithy.api#http": { "method": "GET", "uri": "/v1/apis/{apiId}/apikeys", @@ -3450,7 +3466,7 @@ "cloudWatchLogsRoleArn": { "target": "com.amazonaws.appsync#String", "traits": { - "smithy.api#documentation": "

The service role that AppSync will assume to publish to Amazon CloudWatch logs in\n your account.

", + "smithy.api#documentation": "

The service role that AppSync will assume to publish to Amazon\n CloudWatch logs in your account.

", "smithy.api#required": {} } }, @@ -3521,7 +3537,7 @@ "clientId": { "target": "com.amazonaws.appsync#String", "traits": { - "smithy.api#documentation": "

The client identifier of the Relying party at the OpenID identity provider. This\n identifier is typically obtained when the Relying party is registered with the OpenID\n identity provider. You can specify a regular expression so the AppSync can validate\n against multiple client identifiers at a time.

" + "smithy.api#documentation": "

The client identifier of the Relying party at the OpenID identity provider. This\n identifier is typically obtained when the Relying party is registered with the OpenID\n identity provider. You can specify a regular expression so the AppSync can\n validate against multiple client identifiers at a time.

" } }, "iatTTL": { @@ -3541,6 +3557,28 @@ "smithy.api#documentation": "

Describes an OpenID Connect configuration.

" } }, + "com.amazonaws.appsync#OpenSearchServiceDataSourceConfig": { + "type": "structure", + "members": { + "endpoint": { + "target": "com.amazonaws.appsync#String", + "traits": { + "smithy.api#documentation": "

The endpoint.

", + "smithy.api#required": {} + } + }, + "awsRegion": { + "target": "com.amazonaws.appsync#String", + "traits": { + "smithy.api#documentation": "

The Amazon Web Services Region.

", + "smithy.api#required": {} + } + } + }, + "traits": { + "smithy.api#documentation": "

Describes an OpenSearch data source configuration.

" + } + }, "com.amazonaws.appsync#OutputType": { "type": "string", "traits": { @@ -4389,7 +4427,13 @@ "elasticsearchConfig": { "target": "com.amazonaws.appsync#ElasticsearchDataSourceConfig", "traits": { - "smithy.api#documentation": "

The new Elasticsearch Service configuration.

" + "smithy.api#documentation": "

The new OpenSearch configuration.

\n

As of September 2021, Amazon Elasticsearch service is Amazon OpenSearch Service. This\n configuration is deprecated. Instead, use UpdateDataSourceRequest$openSearchServiceConfig to update an OpenSearch data source.

" + } + }, + "openSearchServiceConfig": { + "target": "com.amazonaws.appsync#OpenSearchServiceDataSourceConfig", + "traits": { + "smithy.api#documentation": "

The new OpenSearch configuration.

" } }, "httpConfig": { @@ -4616,7 +4660,7 @@ "lambdaAuthorizerConfig": { "target": "com.amazonaws.appsync#LambdaAuthorizerConfig", "traits": { - "smithy.api#documentation": "

Configuration for AWS Lambda function authorization.

" + "smithy.api#documentation": "

Configuration for Amazon Web Services Lambda function authorization.

" } } } diff --git a/codegen/sdk-codegen/aws-models/comprehend.2017-11-27.json b/codegen/sdk-codegen/aws-models/comprehend.2017-11-27.json index eecb5fdabfa..4ae65847063 100644 --- a/codegen/sdk-codegen/aws-models/comprehend.2017-11-27.json +++ b/codegen/sdk-codegen/aws-models/comprehend.2017-11-27.json @@ -73,6 +73,12 @@ "smithy.api#required": {} } }, + "Split": { + "target": "com.amazonaws.comprehend#Split", + "traits": { + "smithy.api#documentation": "

The purpose of the data you've provided in the augmented manifest. You can either train or test this data. If you don't specify, the default is train.

\n

TRAIN - all of the documents in the manifest will be used for training. If no test documents are provided, Amazon Comprehend will automatically reserve a portion of the training documents for testing.

\n

TEST - all of the documents in the manifest will be used for testing.

" + } + }, "AttributeNames": { "target": "com.amazonaws.comprehend#AttributeNamesList", "traits": { @@ -765,7 +771,7 @@ "min": 0, "max": 256 }, - "smithy.api#pattern": "^arn:aws(-[^:]+)?:comprehend:[a-zA-Z0-9-]*:[0-9]{12}:[a-zA-Z0-9-]{1,64}/[a-zA-Z0-9](-*[a-zA-Z0-9])*$" + "smithy.api#pattern": "^arn:aws(-[^:]+)?:comprehend:[a-zA-Z0-9-]*:[0-9]{12}:[a-zA-Z0-9-]{1,64}/[a-zA-Z0-9](-*[a-zA-Z0-9])*(/version/[a-zA-Z0-9](-*[a-zA-Z0-9])*)?$" } }, "com.amazonaws.comprehend#ComprehendArnName": { @@ -805,7 +811,7 @@ "min": 0, "max": 256 }, - "smithy.api#pattern": "^arn:aws(-[^:]+)?:comprehend:[a-zA-Z0-9-]*:[0-9]{12}:(document-classifier|entity-recognizer)/[a-zA-Z0-9](-*[a-zA-Z0-9])*$" + "smithy.api#pattern": "^arn:aws(-[^:]+)?:comprehend:[a-zA-Z0-9-]*:[0-9]{12}:(document-classifier|entity-recognizer)/[a-zA-Z0-9](-*[a-zA-Z0-9])*(/version/[a-zA-Z0-9](-*[a-zA-Z0-9])*)?$" } }, "com.amazonaws.comprehend#Comprehend_20171127": { @@ -908,6 +914,9 @@ { "target": "com.amazonaws.comprehend#ListDocumentClassifiers" }, + { + "target": "com.amazonaws.comprehend#ListDocumentClassifierSummaries" + }, { "target": "com.amazonaws.comprehend#ListDominantLanguageDetectionJobs" }, @@ -920,6 +929,9 @@ { "target": "com.amazonaws.comprehend#ListEntityRecognizers" }, + { + "target": "com.amazonaws.comprehend#ListEntityRecognizerSummaries" + }, { "target": "com.amazonaws.comprehend#ListEventsDetectionJobs" }, @@ -1129,6 +1141,12 @@ "smithy.api#required": {} } }, + "VersionName": { + "target": "com.amazonaws.comprehend#VersionName", + "traits": { + "smithy.api#documentation": "

The version name given to the newly created classifier. \n Version names can have a maximum of 256 characters. Alphanumeric characters, hyphens (-) and underscores (_) are allowed. \n The version name must be unique among all models with the same classifier name in the account/AWS Region.

" + } + }, "DataAccessRoleArn": { "target": "com.amazonaws.comprehend#IamRoleArn", "traits": { @@ -1348,6 +1366,12 @@ "smithy.api#required": {} } }, + "VersionName": { + "target": "com.amazonaws.comprehend#VersionName", + "traits": { + "smithy.api#documentation": "

The version name given to the newly created recognizer. \n Version names can be a maximum of 256 characters. Alphanumeric characters, hyphens (-) and underscores (_) are allowed. \n The version name must be unique among all models with the same recognizer name in the account/ AWS Region.

" + } + }, "DataAccessRoleArn": { "target": "com.amazonaws.comprehend#IamRoleArn", "traits": { @@ -2657,6 +2681,12 @@ "smithy.api#documentation": "

Filters the list of classifiers based on status.

" } }, + "DocumentClassifierName": { + "target": "com.amazonaws.comprehend#ComprehendArnName", + "traits": { + "smithy.api#documentation": "

The name that you assigned to the document classifier

" + } + }, "SubmitTimeBefore": { "target": "com.amazonaws.comprehend#Timestamp", "traits": { @@ -2689,6 +2719,12 @@ "smithy.api#documentation": "

The Amazon S3 URI for the input data. The S3 bucket must be in the same region as the API\n endpoint that you are calling. The URI can point to a single input file or it can provide the\n prefix for a collection of input files.

\n

For example, if you use the URI S3://bucketName/prefix, if the prefix is a\n single file, Amazon Comprehend uses that file as input. If more than one file begins with the\n prefix, Amazon Comprehend uses all of them as input.

\n

This parameter is required if you set DataFormat to\n COMPREHEND_CSV.

" } }, + "TestS3Uri": { + "target": "com.amazonaws.comprehend#S3Uri", + "traits": { + "smithy.api#documentation": "

The Amazon S3 URI for the input data. \n The Amazon S3 bucket must be in the same AWS Region as the API endpoint that you are calling.\n The URI can point to a single input file or it can provide the prefix for a collection of input files.

" + } + }, "LabelDelimiter": { "target": "com.amazonaws.comprehend#LabelDelimiter", "traits": { @@ -2839,6 +2875,12 @@ "traits": { "smithy.api#documentation": "

ID for the AWS Key Management Service (KMS) key that Amazon Comprehend uses to encrypt\n trained custom models. The ModelKmsKeyId can be either of the following formats:

\n " } + }, + "VersionName": { + "target": "com.amazonaws.comprehend#VersionName", + "traits": { + "smithy.api#documentation": "

The version name that you assigned to the document classifier.

" + } } }, "traits": { @@ -2851,6 +2893,50 @@ "target": "com.amazonaws.comprehend#DocumentClassifierProperties" } }, + "com.amazonaws.comprehend#DocumentClassifierSummariesList": { + "type": "list", + "member": { + "target": "com.amazonaws.comprehend#DocumentClassifierSummary" + } + }, + "com.amazonaws.comprehend#DocumentClassifierSummary": { + "type": "structure", + "members": { + "DocumentClassifierName": { + "target": "com.amazonaws.comprehend#ComprehendArnName", + "traits": { + "smithy.api#documentation": "

The name that you assigned the document classifier.

" + } + }, + "NumberOfVersions": { + "target": "com.amazonaws.comprehend#Integer", + "traits": { + "smithy.api#documentation": "

The number of versions you created.

" + } + }, + "LatestVersionCreatedAt": { + "target": "com.amazonaws.comprehend#Timestamp", + "traits": { + "smithy.api#documentation": "

The time that the latest document classifier version was submitted for processing.

" + } + }, + "LatestVersionName": { + "target": "com.amazonaws.comprehend#VersionName", + "traits": { + "smithy.api#documentation": "

The version name you assigned to the latest document classifier version.

" + } + }, + "LatestVersionStatus": { + "target": "com.amazonaws.comprehend#ModelStatus", + "traits": { + "smithy.api#documentation": "

Provides the status of the latest document classifier version.

" + } + } + }, + "traits": { + "smithy.api#documentation": "

Describes information about a document classifier and its versions.

" + } + }, "com.amazonaws.comprehend#DocumentLabel": { "type": "structure", "members": { @@ -3147,6 +3233,12 @@ "smithy.api#documentation": "

The Amazon Resource Number (ARN) of the model to which the endpoint is attached.

" } }, + "DesiredModelArn": { + "target": "com.amazonaws.comprehend#ComprehendModelArn", + "traits": { + "smithy.api#documentation": "

ARN of the new model to use for updating an existing endpoint. This ARN is going to be different from the model ARN when the update is in progress

" + } + }, "DesiredInferenceUnits": { "target": "com.amazonaws.comprehend#InferenceUnitsInteger", "traits": { @@ -3176,6 +3268,12 @@ "traits": { "smithy.api#documentation": "

The Amazon Resource Name (ARN) of the AWS identity and Access Management (IAM) role that\n grants Amazon Comprehend read access to trained custom models encrypted with a customer\n managed key (ModelKmsKeyId).

" } + }, + "DesiredDataAccessRoleArn": { + "target": "com.amazonaws.comprehend#IamRoleArn", + "traits": { + "smithy.api#documentation": "

Data access role ARN to use in case the new model is encrypted with a customer KMS key.

" + } } }, "traits": { @@ -3412,6 +3510,12 @@ "smithy.api#documentation": "

Specifies the Amazon S3 location where the annotations for an entity recognizer are\n located. The URI must be in the same region as the API endpoint that you are calling.

", "smithy.api#required": {} } + }, + "TestS3Uri": { + "target": "com.amazonaws.comprehend#S3Uri", + "traits": { + "smithy.api#documentation": "

This specifies the Amazon S3 location where the test annotations for an entity recognizer are located. \n The URI must be in the same AWS Region as the API endpoint that you are calling.

" + } } }, "traits": { @@ -3458,6 +3562,18 @@ "smithy.api#documentation": "

Specifies the Amazon S3 location where the training documents for an entity recognizer\n are located. The URI must be in the same region as the API endpoint that you are\n calling.

", "smithy.api#required": {} } + }, + "TestS3Uri": { + "target": "com.amazonaws.comprehend#S3Uri", + "traits": { + "smithy.api#documentation": "

Specifies the Amazon S3 location where the test documents for an entity recognizer are located. \n The URI must be in the same AWS Region as the API endpoint that you are calling.

" + } + }, + "InputFormat": { + "target": "com.amazonaws.comprehend#InputFormat", + "traits": { + "smithy.api#documentation": "

Specifies how the text in an input file should be processed. This is optional, and the default is ONE_DOC_PER_LINE.\n \n ONE_DOC_PER_FILE - Each file is considered a separate document. Use this option when you are processing large documents, such as newspaper articles or scientific papers.\n \n ONE_DOC_PER_LINE - Each line in a file is considered a separate document. Use this option when you are processing many short documents, such as text messages.

" + } } }, "traits": { @@ -3524,6 +3640,12 @@ "smithy.api#documentation": "

The status of an entity recognizer.

" } }, + "RecognizerName": { + "target": "com.amazonaws.comprehend#ComprehendArnName", + "traits": { + "smithy.api#documentation": "

The name that you assigned the entity recognizer.

" + } + }, "SubmitTimeBefore": { "target": "com.amazonaws.comprehend#Timestamp", "traits": { @@ -3737,6 +3859,12 @@ "traits": { "smithy.api#documentation": "

ID for the AWS Key Management Service (KMS) key that Amazon Comprehend uses to encrypt\n trained custom models. The ModelKmsKeyId can be either of the following formats:

\n " } + }, + "VersionName": { + "target": "com.amazonaws.comprehend#VersionName", + "traits": { + "smithy.api#documentation": "

The version name you assigned to the entity recognizer.

" + } } }, "traits": { @@ -3749,6 +3877,50 @@ "target": "com.amazonaws.comprehend#EntityRecognizerProperties" } }, + "com.amazonaws.comprehend#EntityRecognizerSummariesList": { + "type": "list", + "member": { + "target": "com.amazonaws.comprehend#EntityRecognizerSummary" + } + }, + "com.amazonaws.comprehend#EntityRecognizerSummary": { + "type": "structure", + "members": { + "RecognizerName": { + "target": "com.amazonaws.comprehend#ComprehendArnName", + "traits": { + "smithy.api#documentation": "

The name that you assigned the entity recognizer.

" + } + }, + "NumberOfVersions": { + "target": "com.amazonaws.comprehend#Integer", + "traits": { + "smithy.api#documentation": "

The number of versions you created.

" + } + }, + "LatestVersionCreatedAt": { + "target": "com.amazonaws.comprehend#Timestamp", + "traits": { + "smithy.api#documentation": "

The time that the latest entity recognizer version was submitted for processing.

" + } + }, + "LatestVersionName": { + "target": "com.amazonaws.comprehend#VersionName", + "traits": { + "smithy.api#documentation": "

The version name you assigned to the latest entity recognizer version.

" + } + }, + "LatestVersionStatus": { + "target": "com.amazonaws.comprehend#ModelStatus", + "traits": { + "smithy.api#documentation": "

Provides the status of the latest entity recognizer version.

" + } + } + }, + "traits": { + "smithy.api#documentation": "

Describes the information about an entity recognizer and its versions.

" + } + }, "com.amazonaws.comprehend#EntityType": { "type": "string", "traits": { @@ -4468,6 +4640,68 @@ } } }, + "com.amazonaws.comprehend#ListDocumentClassifierSummaries": { + "type": "operation", + "input": { + "target": "com.amazonaws.comprehend#ListDocumentClassifierSummariesRequest" + }, + "output": { + "target": "com.amazonaws.comprehend#ListDocumentClassifierSummariesResponse" + }, + "errors": [ + { + "target": "com.amazonaws.comprehend#InternalServerException" + }, + { + "target": "com.amazonaws.comprehend#InvalidRequestException" + }, + { + "target": "com.amazonaws.comprehend#TooManyRequestsException" + } + ], + "traits": { + "smithy.api#documentation": "

Gets a list of summaries of the document classifiers that you have created

", + "smithy.api#paginated": { + "inputToken": "NextToken", + "outputToken": "NextToken", + "pageSize": "MaxResults" + } + } + }, + "com.amazonaws.comprehend#ListDocumentClassifierSummariesRequest": { + "type": "structure", + "members": { + "NextToken": { + "target": "com.amazonaws.comprehend#String", + "traits": { + "smithy.api#documentation": "

Identifies the next page of results to return.

" + } + }, + "MaxResults": { + "target": "com.amazonaws.comprehend#MaxResultsInteger", + "traits": { + "smithy.api#documentation": "

The maximum number of results to return on each page. The default is 100.

" + } + } + } + }, + "com.amazonaws.comprehend#ListDocumentClassifierSummariesResponse": { + "type": "structure", + "members": { + "DocumentClassifierSummariesList": { + "target": "com.amazonaws.comprehend#DocumentClassifierSummariesList", + "traits": { + "smithy.api#documentation": "

The list of summaries of document classifiers.

" + } + }, + "NextToken": { + "target": "com.amazonaws.comprehend#String", + "traits": { + "smithy.api#documentation": "

Identifies the next page of results to return.

" + } + } + } + }, "com.amazonaws.comprehend#ListDocumentClassifiers": { "type": "operation", "input": { @@ -4744,6 +4978,68 @@ } } }, + "com.amazonaws.comprehend#ListEntityRecognizerSummaries": { + "type": "operation", + "input": { + "target": "com.amazonaws.comprehend#ListEntityRecognizerSummariesRequest" + }, + "output": { + "target": "com.amazonaws.comprehend#ListEntityRecognizerSummariesResponse" + }, + "errors": [ + { + "target": "com.amazonaws.comprehend#InternalServerException" + }, + { + "target": "com.amazonaws.comprehend#InvalidRequestException" + }, + { + "target": "com.amazonaws.comprehend#TooManyRequestsException" + } + ], + "traits": { + "smithy.api#documentation": "

Gets a list of summaries for the entity recognizers that you have created.

", + "smithy.api#paginated": { + "inputToken": "NextToken", + "outputToken": "NextToken", + "pageSize": "MaxResults" + } + } + }, + "com.amazonaws.comprehend#ListEntityRecognizerSummariesRequest": { + "type": "structure", + "members": { + "NextToken": { + "target": "com.amazonaws.comprehend#String", + "traits": { + "smithy.api#documentation": "

Identifies the next page of results to return.

" + } + }, + "MaxResults": { + "target": "com.amazonaws.comprehend#MaxResultsInteger", + "traits": { + "smithy.api#documentation": "

The maximum number of results to return on each page. The default is 100.

" + } + } + } + }, + "com.amazonaws.comprehend#ListEntityRecognizerSummariesResponse": { + "type": "structure", + "members": { + "EntityRecognizerSummariesList": { + "target": "com.amazonaws.comprehend#EntityRecognizerSummariesList", + "traits": { + "smithy.api#documentation": "

The list entity recognizer summaries.

" + } + }, + "NextToken": { + "target": "com.amazonaws.comprehend#String", + "traits": { + "smithy.api#documentation": "

The list entity recognizer summaries.

" + } + } + } + }, "com.amazonaws.comprehend#ListEntityRecognizers": { "type": "operation", "input": { @@ -6093,6 +6389,21 @@ ] } }, + "com.amazonaws.comprehend#Split": { + "type": "string", + "traits": { + "smithy.api#enum": [ + { + "value": "TRAIN", + "name": "TRAIN" + }, + { + "value": "TEST", + "name": "TEST" + } + ] + } + }, "com.amazonaws.comprehend#StartDocumentClassificationJob": { "type": "operation", "input": { @@ -7925,11 +8236,22 @@ "smithy.api#required": {} } }, + "DesiredModelArn": { + "target": "com.amazonaws.comprehend#ComprehendModelArn", + "traits": { + "smithy.api#documentation": "

The ARN of the new model to use when updating an existing endpoint.

" + } + }, "DesiredInferenceUnits": { "target": "com.amazonaws.comprehend#InferenceUnitsInteger", "traits": { - "smithy.api#documentation": "

The desired number of inference units to be used by the model using this endpoint.\n \n Each inference unit represents of a throughput of 100 characters per second.

", - "smithy.api#required": {} + "smithy.api#documentation": "

The desired number of inference units to be used by the model using this endpoint.\n \n Each inference unit represents of a throughput of 100 characters per second.

" + } + }, + "DesiredDataAccessRoleArn": { + "target": "com.amazonaws.comprehend#IamRoleArn", + "traits": { + "smithy.api#documentation": "

Data access role ARN to use in case the new model is encrypted with a customer CMK.

" } } } @@ -7938,6 +8260,16 @@ "type": "structure", "members": {} }, + "com.amazonaws.comprehend#VersionName": { + "type": "string", + "traits": { + "smithy.api#length": { + "min": 0, + "max": 63 + }, + "smithy.api#pattern": "^[a-zA-Z0-9](-*[a-zA-Z0-9])*$" + } + }, "com.amazonaws.comprehend#VpcConfig": { "type": "structure", "members": { diff --git a/codegen/sdk-codegen/aws-models/databasemigrationservice.2016-01-01.json b/codegen/sdk-codegen/aws-models/databasemigrationservice.2016-01-01.json index dd6b446eb81..80d9de60818 100644 --- a/codegen/sdk-codegen/aws-models/databasemigrationservice.2016-01-01.json +++ b/codegen/sdk-codegen/aws-models/databasemigrationservice.2016-01-01.json @@ -344,7 +344,7 @@ "ApplyAction": { "target": "com.amazonaws.databasemigrationservice#String", "traits": { - "smithy.api#documentation": "

The pending maintenance action to apply to this resource.

", + "smithy.api#documentation": "

The pending maintenance action to apply to this resource.

\n

Valid values: os-upgrade, system-update, db-upgrade \n

", "smithy.api#required": {} } }, @@ -847,7 +847,7 @@ "DmsTransferSettings": { "target": "com.amazonaws.databasemigrationservice#DmsTransferSettings", "traits": { - "smithy.api#documentation": "

The settings in JSON format for the DMS transfer type of source endpoint.

\n

Possible settings include the following:

\n \n

Shorthand syntax for these settings is as follows:\n ServiceAccessRoleArn=string,BucketName=string\n

\n

JSON syntax for these settings is as follows: { \"ServiceAccessRoleArn\":\n \"string\", \"BucketName\": \"string\", } \n

" + "smithy.api#documentation": "

The settings in JSON format for the DMS transfer type of source endpoint.

\n

Possible settings include the following:

\n \n

Shorthand syntax for these settings is as follows:\n ServiceAccessRoleArn=string,BucketName=string\n

\n

JSON syntax for these settings is as follows: { \"ServiceAccessRoleArn\":\n \"string\", \"BucketName\": \"string\", } \n

" } }, "MongoDbSettings": { @@ -1250,7 +1250,7 @@ } ], "traits": { - "smithy.api#documentation": "

Creates a replication subnet group given a list of the subnet IDs in a VPC.

" + "smithy.api#documentation": "

Creates a replication subnet group given a list of the subnet IDs in a VPC.

\n

The VPC needs to have at least one subnet in at least two availability zones in the Amazon Web Services Region, otherwise the\n service will throw a ReplicationSubnetGroupDoesNotCoverEnoughAZs exception.

" } }, "com.amazonaws.databasemigrationservice#CreateReplicationSubnetGroupMessage": { @@ -3913,7 +3913,7 @@ "ServiceAccessRoleArn": { "target": "com.amazonaws.databasemigrationservice#String", "traits": { - "smithy.api#documentation": "

The IAM role that has permission to access the Amazon S3 bucket. When specified as part of request syntax,\n such as for the CreateEndpoint and ModifyEndpoint actions,\n the role must allow the iam:PassRole action.

" + "smithy.api#documentation": "

The Amazon Resource Name (ARN) used by the service access IAM role. The role must allow the iam:PassRole action.

" } }, "BucketName": { @@ -4204,7 +4204,7 @@ "DmsTransferSettings": { "target": "com.amazonaws.databasemigrationservice#DmsTransferSettings", "traits": { - "smithy.api#documentation": "

The settings in JSON format for the DMS transfer type of source endpoint.

\n

Possible settings include the following:

\n \n

Shorthand syntax for these settings is as follows:\n ServiceAccessRoleArn=string,BucketName=string,\n

\n

JSON syntax for these settings is as follows: { \"ServiceAccessRoleArn\":\n \"string\", \"BucketName\": \"string\"} \n

" + "smithy.api#documentation": "

The settings in JSON format for the DMS transfer type of source endpoint.

\n

Possible settings include the following:

\n \n

Shorthand syntax for these settings is as follows:\n ServiceAccessRoleArn=string,BucketName=string,\n

\n

JSON syntax for these settings is as follows: { \"ServiceAccessRoleArn\":\n \"string\", \"BucketName\": \"string\"} \n

" } }, "MongoDbSettings": { @@ -5432,7 +5432,7 @@ "DmsTransferSettings": { "target": "com.amazonaws.databasemigrationservice#DmsTransferSettings", "traits": { - "smithy.api#documentation": "

The settings in JSON format for the DMS transfer type of source endpoint.

\n

Attributes include the following:

\n \n

Shorthand syntax for these settings is as follows: ServiceAccessRoleArn=string\n ,BucketName=string\n

\n

JSON syntax for these settings is as follows: { \"ServiceAccessRoleArn\": \"string\",\n \"BucketName\": \"string\"} \n

" + "smithy.api#documentation": "

The settings in JSON format for the DMS transfer type of source endpoint.

\n

Attributes include the following:

\n \n

Shorthand syntax for these settings is as follows: ServiceAccessRoleArn=string\n ,BucketName=string\n

\n

JSON syntax for these settings is as follows: { \"ServiceAccessRoleArn\": \"string\",\n \"BucketName\": \"string\"} \n

" } }, "MongoDbSettings": { @@ -6816,7 +6816,13 @@ "ForceFailover": { "target": "com.amazonaws.databasemigrationservice#BooleanOptional", "traits": { - "smithy.api#documentation": "

If this parameter is true, the reboot is conducted through a Multi-AZ\n failover. (If the instance isn't configured for Multi-AZ, then you can't specify\n true.)

" + "smithy.api#documentation": "

If this parameter is true, the reboot is conducted through a Multi-AZ\n failover. If the instance isn't configured for Multi-AZ, then you can't specify\n true. ( --force-planned-failover and --force-failover can't both be set to true.)

" + } + }, + "ForcePlannedFailover": { + "target": "com.amazonaws.databasemigrationservice#BooleanOptional", + "traits": { + "smithy.api#documentation": "

If this parameter is true, the reboot is conducted through a planned Multi-AZ failover \n where resources are released and cleaned up prior to conducting the failover. \n If the instance isn''t configured for Multi-AZ, then you can't specify true. \n ( --force-planned-failover and --force-failover can't both be set to true.)

" } } } @@ -7253,7 +7259,7 @@ } ], "traits": { - "smithy.api#documentation": "

Reloads the target database table with the source data.

" + "smithy.api#documentation": "

Reloads the target database table with the source data.

\n

You can only use this operation with a task in the RUNNING state, otherwise the service\n will throw an InvalidResourceStateFault exception.

" } }, "com.amazonaws.databasemigrationservice#ReloadTablesMessage": { diff --git a/codegen/sdk-codegen/aws-models/ec2.2016-11-15.json b/codegen/sdk-codegen/aws-models/ec2.2016-11-15.json index 5fc35a63cc2..7a3943d0380 100644 --- a/codegen/sdk-codegen/aws-models/ec2.2016-11-15.json +++ b/codegen/sdk-codegen/aws-models/ec2.2016-11-15.json @@ -2218,6 +2218,12 @@ { "target": "com.amazonaws.ec2#GetTransitGatewayRouteTablePropagations" }, + { + "target": "com.amazonaws.ec2#GetVpnConnectionDeviceSampleConfiguration" + }, + { + "target": "com.amazonaws.ec2#GetVpnConnectionDeviceTypes" + }, { "target": "com.amazonaws.ec2#ImportClientVpnClientCertificateRevocationList" }, @@ -3378,7 +3384,7 @@ "ClientToken": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see How to Ensure Idempotency.

", + "smithy.api#documentation": "

Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see How to ensure idempotency.

", "smithy.api#idempotencyToken": {} } }, @@ -4444,7 +4450,7 @@ "target": "com.amazonaws.ec2#AttachVpnGatewayResult" }, "traits": { - "smithy.api#documentation": "

Attaches a virtual private gateway to a VPC. You can attach one virtual private\n gateway to one VPC at a time.

\n

For more information, see AWS Site-to-Site VPN in the AWS Site-to-Site VPN User Guide.

" + "smithy.api#documentation": "

Attaches a virtual private gateway to a VPC. You can attach one virtual private\n gateway to one VPC at a time.

\n

For more information, see Amazon Web Services Site-to-Site VPN in the Amazon Web Services Site-to-Site VPN\n User Guide.

" } }, "com.amazonaws.ec2#AttachVpnGatewayRequest": { @@ -4468,7 +4474,7 @@ "target": "com.amazonaws.ec2#Boolean", "traits": { "aws.protocols#ec2QueryName": "DryRun", - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n and provides an error response. If you have the required permissions, the error response is DryRunOperation. \n Otherwise, it is UnauthorizedOperation.

", + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

", "smithy.api#xmlName": "dryRun" } } @@ -4622,7 +4628,7 @@ "target": "com.amazonaws.ec2#AuthorizeClientVpnIngressResult" }, "traits": { - "smithy.api#documentation": "

Adds an ingress authorization rule to a Client VPN endpoint. Ingress authorization rules act as \n\t\t\tfirewall rules that grant access to networks. You must configure ingress authorization rules to \n\t\t\tenable clients to access resources in AWS or on-premises networks.

" + "smithy.api#documentation": "

Adds an ingress authorization rule to a Client VPN endpoint. Ingress authorization rules act as \n\t\t\tfirewall rules that grant access to networks. You must configure ingress authorization rules to \n\t\t\tenable clients to access resources in Amazon Web Services or on-premises networks.

" } }, "com.amazonaws.ec2#AuthorizeClientVpnIngressRequest": { @@ -4663,7 +4669,7 @@ "ClientToken": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see How to Ensure Idempotency.

", + "smithy.api#documentation": "

Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see How to ensure idempotency.

", "smithy.api#idempotencyToken": {} } }, @@ -6816,7 +6822,7 @@ "ClientRootCertificateChainArn": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The ARN of the client certificate. The certificate must be signed by a certificate \n\t\t\tauthority (CA) and it must be provisioned in AWS Certificate Manager (ACM).

" + "smithy.api#documentation": "

The ARN of the client certificate. The certificate must be signed by a certificate \n\t\t\tauthority (CA) and it must be provisioned in Certificate Manager (ACM).

" } } }, @@ -7051,7 +7057,7 @@ "LambdaFunctionArn": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The Amazon Resource Name (ARN) of the AWS Lambda function used for connection authorization.

" + "smithy.api#documentation": "

The Amazon Resource Name (ARN) of the Lambda function used for connection authorization.

" } } }, @@ -7074,7 +7080,7 @@ "target": "com.amazonaws.ec2#String", "traits": { "aws.protocols#ec2QueryName": "LambdaFunctionArn", - "smithy.api#documentation": "

The Amazon Resource Name (ARN) of the AWS Lambda function used for connection authorization.

", + "smithy.api#documentation": "

The Amazon Resource Name (ARN) of the Lambda function used for connection authorization.

", "smithy.api#xmlName": "lambdaFunctionArn" } }, @@ -7163,7 +7169,7 @@ } }, "traits": { - "smithy.api#documentation": "

Describes the authentication methods used by a Client VPN endpoint. For more information, see Authentication \n\t\t\tin the AWS Client VPN Administrator Guide.

" + "smithy.api#documentation": "

Describes the authentication methods used by a Client VPN endpoint. For more information, see Authentication \n\t\t\tin the Client VPN Administrator Guide.

" } }, "com.amazonaws.ec2#ClientVpnAuthenticationList": { @@ -7204,7 +7210,7 @@ } }, "traits": { - "smithy.api#documentation": "

Describes the authentication method to be used by a Client VPN endpoint. For more information, see Authentication \n\t\t\tin the AWS Client VPN Administrator Guide.

" + "smithy.api#documentation": "

Describes the authentication method to be used by a Client VPN endpoint. For more information, see Authentication \n\t\t\tin the Client VPN Administrator Guide.

" } }, "com.amazonaws.ec2#ClientVpnAuthenticationRequestList": { @@ -7526,7 +7532,7 @@ "target": "com.amazonaws.ec2#Boolean", "traits": { "aws.protocols#ec2QueryName": "SplitTunnel", - "smithy.api#documentation": "

Indicates whether split-tunnel is enabled in the AWS Client VPN endpoint.

\n\t\t

For information about split-tunnel VPN endpoints, see Split-Tunnel AWS Client VPN Endpoint in the AWS\n\t\t\t\tClient VPN Administrator Guide.

", + "smithy.api#documentation": "

Indicates whether split-tunnel is enabled in the Client VPN endpoint.

\n\t\t

For information about split-tunnel VPN endpoints, see Split-Tunnel Client VPN endpoint \n\t\t\tin the Client VPN Administrator Guide.

", "smithy.api#xmlName": "splitTunnel" } }, @@ -8889,7 +8895,7 @@ "ServerCertificateArn": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The ARN of the server certificate. For more information, see \n\t\t\tthe AWS Certificate Manager User Guide.

", + "smithy.api#documentation": "

The ARN of the server certificate. For more information, see \n\t\t\tthe Certificate Manager User Guide.

", "smithy.api#required": {} } }, @@ -8935,7 +8941,7 @@ "SplitTunnel": { "target": "com.amazonaws.ec2#Boolean", "traits": { - "smithy.api#documentation": "

Indicates whether split-tunnel is enabled on the AWS Client VPN endpoint.

\n\t\t

By default, split-tunnel on a VPN endpoint is disabled.

\n\t\t

For information about split-tunnel VPN endpoints, see Split-Tunnel AWS Client VPN Endpoint in the AWS\n\t\t\t\tClient VPN Administrator Guide.

" + "smithy.api#documentation": "

Indicates whether split-tunnel is enabled on the Client VPN endpoint.

\n\t\t

By default, split-tunnel on a VPN endpoint is disabled.

\n\t\t

For information about split-tunnel VPN endpoints, see Split-tunnel Client VPN endpoint in the \n\t\t\tClient VPN Administrator Guide.

" } }, "DryRun": { @@ -8947,7 +8953,7 @@ "ClientToken": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see How to Ensure Idempotency.

", + "smithy.api#documentation": "

Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see How to ensure idempotency.

", "smithy.api#idempotencyToken": {} } }, @@ -9039,7 +9045,7 @@ "DestinationCidrBlock": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The IPv4 address range, in CIDR notation, of the route destination. For example:

\n\t\t ", + "smithy.api#documentation": "

The IPv4 address range, in CIDR notation, of the route destination. For example:

\n\t\t ", "smithy.api#required": {} } }, @@ -9059,7 +9065,7 @@ "ClientToken": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see How to Ensure Idempotency.

", + "smithy.api#documentation": "

Unique, case-sensitive identifier that you provide to ensure the idempotency of the request. For more information, see How to ensure idempotency.

", "smithy.api#idempotencyToken": {} } }, @@ -9093,7 +9099,7 @@ "target": "com.amazonaws.ec2#CreateCustomerGatewayResult" }, "traits": { - "smithy.api#documentation": "

Provides information to AWS about your VPN customer gateway device. The customer\n gateway is the appliance at your end of the VPN connection. (The device on the AWS side\n of the VPN connection is the virtual private gateway.) You must provide the\n internet-routable IP address of the customer gateway's external interface. The IP\n address must be static and can be behind a device performing network address translation\n (NAT).

\n

For devices that use Border Gateway Protocol (BGP), you can also provide the device's\n BGP Autonomous System Number (ASN). You can use an existing ASN assigned to your\n network. If you don't have an ASN already, you can use a private ASN (in the 64512 -\n 65534 range).

\n \n

Amazon EC2 supports all 4-byte ASN numbers in the range of 1 - 2147483647, with the\n exception of the following:

\n \n \n

For more information, see AWS Site-to-Site VPN in the AWS Site-to-Site VPN\n User Guide.

\n \n

To create more than one customer gateway with the same VPN type, IP address, and\n BGP ASN, specify a unique device name for each customer gateway. Identical requests\n return information about the existing customer gateway and do not create new\n customer gateways.

\n " + "smithy.api#documentation": "

Provides information to Amazon Web Services about your VPN customer gateway device. The\n customer gateway is the appliance at your end of the VPN connection. (The device on the\n Amazon Web Services side of the VPN connection is the virtual private gateway.) You\n must provide the internet-routable IP address of the customer gateway's external\n interface. The IP address must be static and can be behind a device performing network\n address translation (NAT).

\n

For devices that use Border Gateway Protocol (BGP), you can also provide the device's\n BGP Autonomous System Number (ASN). You can use an existing ASN assigned to your\n network. If you don't have an ASN already, you can use a private ASN (in the 64512 -\n 65534 range).

\n \n

Amazon EC2 supports all 4-byte ASN numbers in the range of 1 - 2147483647, with\n the exception of the following:

\n \n \n

For more information, see Amazon Web Services Site-to-Site VPN in the Amazon Web Services Site-to-Site VPN\n User Guide.

\n \n

To create more than one customer gateway with the same VPN type, IP address, and\n BGP ASN, specify a unique device name for each customer gateway. Identical requests\n return information about the existing customer gateway and do not create new\n customer gateways.

\n " } }, "com.amazonaws.ec2#CreateCustomerGatewayRequest": { @@ -9109,7 +9115,7 @@ "PublicIp": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The Internet-routable IP address for the customer gateway's outside interface. The address must be static.

", + "smithy.api#documentation": "

The Internet-routable IP address for the customer gateway's outside interface. The\n address must be static.

", "smithy.api#xmlName": "IpAddress" } }, @@ -9122,7 +9128,7 @@ "Type": { "target": "com.amazonaws.ec2#GatewayType", "traits": { - "smithy.api#documentation": "

The type of VPN connection that this customer gateway supports (ipsec.1).

", + "smithy.api#documentation": "

The type of VPN connection that this customer gateway supports\n (ipsec.1).

", "smithy.api#required": {} } }, @@ -9143,7 +9149,7 @@ "target": "com.amazonaws.ec2#Boolean", "traits": { "aws.protocols#ec2QueryName": "DryRun", - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n and provides an error response. If you have the required permissions, the error response is DryRunOperation. \n Otherwise, it is UnauthorizedOperation.

", + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

", "smithy.api#xmlName": "dryRun" } } @@ -13565,7 +13571,7 @@ "target": "com.amazonaws.ec2#CreateVpnConnectionResult" }, "traits": { - "smithy.api#documentation": "

Creates a VPN connection between an existing virtual private gateway or transit gateway and a\n customer gateway. The supported connection type is ipsec.1.

\n

The response includes information that you need to give to your network administrator\n to configure your customer gateway.

\n \n

We strongly recommend that you use HTTPS when calling this operation because the\n response contains sensitive cryptographic information for configuring your customer\n gateway device.

\n \n

If you decide to shut down your VPN connection for any reason and later create a new\n VPN connection, you must reconfigure your customer gateway with the new information\n returned from this call.

\n

This is an idempotent operation. If you perform the operation more than once, Amazon\n EC2 doesn't return an error.

\n

For more information, see AWS Site-to-Site VPN in the AWS Site-to-Site VPN\n User Guide.

" + "smithy.api#documentation": "

Creates a VPN connection between an existing virtual private gateway or transit\n gateway and a customer gateway. The supported connection type is\n ipsec.1.

\n

The response includes information that you need to give to your network administrator\n to configure your customer gateway.

\n \n

We strongly recommend that you use HTTPS when calling this operation because the\n response contains sensitive cryptographic information for configuring your customer\n gateway device.

\n \n

If you decide to shut down your VPN connection for any reason and later create a new\n VPN connection, you must reconfigure your customer gateway with the new information\n returned from this call.

\n

This is an idempotent operation. If you perform the operation more than once, Amazon\n EC2 doesn't return an error.

\n

For more information, see Amazon Web Services Site-to-Site VPN in the Amazon Web Services Site-to-Site VPN\n User Guide.

" } }, "com.amazonaws.ec2#CreateVpnConnectionRequest": { @@ -13588,20 +13594,20 @@ "VpnGatewayId": { "target": "com.amazonaws.ec2#VpnGatewayId", "traits": { - "smithy.api#documentation": "

The ID of the virtual private gateway. If you specify a virtual private gateway, you cannot specify a transit gateway.

" + "smithy.api#documentation": "

The ID of the virtual private gateway. If you specify a virtual private gateway, you\n cannot specify a transit gateway.

" } }, "TransitGatewayId": { "target": "com.amazonaws.ec2#TransitGatewayId", "traits": { - "smithy.api#documentation": "

The ID of the transit gateway. If you specify a transit gateway, you cannot specify a virtual private gateway.

" + "smithy.api#documentation": "

The ID of the transit gateway. If you specify a transit gateway, you cannot specify a virtual private\n gateway.

" } }, "DryRun": { "target": "com.amazonaws.ec2#Boolean", "traits": { "aws.protocols#ec2QueryName": "DryRun", - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n and provides an error response. If you have the required permissions, the error response is DryRunOperation. \n Otherwise, it is UnauthorizedOperation.

", + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

", "smithy.api#xmlName": "dryRun" } }, @@ -13647,7 +13653,7 @@ "target": "com.amazonaws.ec2#CreateVpnConnectionRouteRequest" }, "traits": { - "smithy.api#documentation": "

Creates a static route associated with a VPN connection between an existing virtual private gateway and a VPN customer gateway. The static route allows traffic to be routed from the virtual private gateway to the VPN customer gateway.

\n

For more information, see AWS Site-to-Site VPN in the AWS Site-to-Site VPN User Guide.

" + "smithy.api#documentation": "

Creates a static route associated with a VPN connection between an existing virtual\n private gateway and a VPN customer gateway. The static route allows traffic to be routed\n from the virtual private gateway to the VPN customer gateway.

\n

For more information, see Amazon Web Services Site-to-Site VPN in the Amazon Web Services Site-to-Site VPN\n User Guide.

" } }, "com.amazonaws.ec2#CreateVpnConnectionRouteRequest": { @@ -13681,7 +13687,7 @@ "target": "com.amazonaws.ec2#CreateVpnGatewayResult" }, "traits": { - "smithy.api#documentation": "

Creates a virtual private gateway. A virtual private gateway is the endpoint on the VPC side of your VPN connection. You can create a virtual private gateway before creating the VPC itself.

\n

For more information, see AWS Site-to-Site VPN in the AWS Site-to-Site VPN User Guide.

" + "smithy.api#documentation": "

Creates a virtual private gateway. A virtual private gateway is the endpoint on the\n VPC side of your VPN connection. You can create a virtual private gateway before\n creating the VPC itself.

\n

For more information, see Amazon Web Services Site-to-Site VPN in the Amazon Web Services Site-to-Site VPN\n User Guide.

" } }, "com.amazonaws.ec2#CreateVpnGatewayRequest": { @@ -13710,14 +13716,14 @@ "AmazonSideAsn": { "target": "com.amazonaws.ec2#Long", "traits": { - "smithy.api#documentation": "

A private Autonomous System Number (ASN) for the Amazon side of a BGP session. If you're using a 16-bit ASN, it must be in the 64512 to 65534 range. If you're using a 32-bit ASN, it must be in the 4200000000 to 4294967294 range.

\n\t\t

Default: 64512

" + "smithy.api#documentation": "

A private Autonomous System Number (ASN) for the Amazon side of a BGP session. If\n you're using a 16-bit ASN, it must be in the 64512 to 65534 range. If you're using a\n 32-bit ASN, it must be in the 4200000000 to 4294967294 range.

\n

Default: 64512

" } }, "DryRun": { "target": "com.amazonaws.ec2#Boolean", "traits": { "aws.protocols#ec2QueryName": "DryRun", - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n and provides an error response. If you have the required permissions, the error response is DryRunOperation. \n Otherwise, it is UnauthorizedOperation.

", + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

", "smithy.api#xmlName": "dryRun" } } @@ -13797,7 +13803,7 @@ "target": "com.amazonaws.ec2#String", "traits": { "aws.protocols#ec2QueryName": "BgpAsn", - "smithy.api#documentation": "

The customer gateway's Border Gateway Protocol (BGP) Autonomous System Number (ASN).

", + "smithy.api#documentation": "

The customer gateway's Border Gateway Protocol (BGP) Autonomous System Number\n (ASN).

", "smithy.api#xmlName": "bgpAsn" } }, @@ -13829,7 +13835,7 @@ "target": "com.amazonaws.ec2#String", "traits": { "aws.protocols#ec2QueryName": "State", - "smithy.api#documentation": "

The current state of the customer gateway (pending | available | deleting |\n deleted).

", + "smithy.api#documentation": "

The current state of the customer gateway (pending | available | deleting |\n deleted).

", "smithy.api#xmlName": "state" } }, @@ -13837,7 +13843,7 @@ "target": "com.amazonaws.ec2#String", "traits": { "aws.protocols#ec2QueryName": "Type", - "smithy.api#documentation": "

The type of VPN connection the customer gateway supports (ipsec.1).

", + "smithy.api#documentation": "

The type of VPN connection the customer gateway supports\n (ipsec.1).

", "smithy.api#xmlName": "type" } }, @@ -14141,7 +14147,7 @@ "target": "com.amazonaws.ec2#DeleteCustomerGatewayRequest" }, "traits": { - "smithy.api#documentation": "

Deletes the specified customer gateway. You must delete the VPN connection before you can delete the customer gateway.

" + "smithy.api#documentation": "

Deletes the specified customer gateway. You must delete the VPN connection before you\n can delete the customer gateway.

" } }, "com.amazonaws.ec2#DeleteCustomerGatewayRequest": { @@ -14158,7 +14164,7 @@ "target": "com.amazonaws.ec2#Boolean", "traits": { "aws.protocols#ec2QueryName": "DryRun", - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n and provides an error response. If you have the required permissions, the error response is DryRunOperation. \n Otherwise, it is UnauthorizedOperation.

", + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

", "smithy.api#xmlName": "dryRun" } } @@ -16504,7 +16510,7 @@ "target": "com.amazonaws.ec2#DeleteVpnConnectionRequest" }, "traits": { - "smithy.api#documentation": "

Deletes the specified VPN connection.

\n

If you're deleting the VPC and its associated components, we recommend that you detach the virtual private gateway from the VPC and delete the VPC before deleting the VPN connection. If you believe that the tunnel credentials for your VPN connection have been compromised, you can delete the VPN connection and create a new one that has new keys, without needing to delete the VPC or virtual private gateway. If you create a new VPN connection, you must reconfigure the customer gateway device using the new configuration information returned with the new VPN connection ID.

\n

For certificate-based authentication, delete all AWS Certificate Manager (ACM) private certificates used for the AWS-side tunnel endpoints for the VPN connection before deleting the VPN connection.

" + "smithy.api#documentation": "

Deletes the specified VPN connection.

\n

If you're deleting the VPC and its associated components, we recommend that you detach\n the virtual private gateway from the VPC and delete the VPC before deleting the VPN\n connection. If you believe that the tunnel credentials for your VPN connection have been\n compromised, you can delete the VPN connection and create a new one that has new keys,\n without needing to delete the VPC or virtual private gateway. If you create a new VPN\n connection, you must reconfigure the customer gateway device using the new configuration\n information returned with the new VPN connection ID.

\n

For certificate-based authentication, delete all Certificate Manager (ACM) private\n certificates used for the Amazon Web Services-side tunnel endpoints for the VPN\n connection before deleting the VPN connection.

" } }, "com.amazonaws.ec2#DeleteVpnConnectionRequest": { @@ -16521,7 +16527,7 @@ "target": "com.amazonaws.ec2#Boolean", "traits": { "aws.protocols#ec2QueryName": "DryRun", - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n and provides an error response. If you have the required permissions, the error response is DryRunOperation. \n Otherwise, it is UnauthorizedOperation.

", + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

", "smithy.api#xmlName": "dryRun" } } @@ -16536,7 +16542,7 @@ "target": "com.amazonaws.ec2#DeleteVpnConnectionRouteRequest" }, "traits": { - "smithy.api#documentation": "

Deletes the specified static route associated with a VPN connection between an existing virtual private gateway and a VPN customer gateway. The static route allows traffic to be routed from the virtual private gateway to the VPN customer gateway.

" + "smithy.api#documentation": "

Deletes the specified static route associated with a VPN connection between an\n existing virtual private gateway and a VPN customer gateway. The static route allows\n traffic to be routed from the virtual private gateway to the VPN customer\n gateway.

" } }, "com.amazonaws.ec2#DeleteVpnConnectionRouteRequest": { @@ -16567,7 +16573,7 @@ "target": "com.amazonaws.ec2#DeleteVpnGatewayRequest" }, "traits": { - "smithy.api#documentation": "

Deletes the specified virtual private gateway. You must first detach the virtual private gateway from the VPC. Note that you don't need to delete the virtual private gateway if you plan to delete and recreate the VPN connection between your VPC and your network.

" + "smithy.api#documentation": "

Deletes the specified virtual private gateway. You must first detach the virtual\n private gateway from the VPC. Note that you don't need to delete the virtual private\n gateway if you plan to delete and recreate the VPN connection between your VPC and your\n network.

" } }, "com.amazonaws.ec2#DeleteVpnGatewayRequest": { @@ -16584,7 +16590,7 @@ "target": "com.amazonaws.ec2#Boolean", "traits": { "aws.protocols#ec2QueryName": "DryRun", - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n and provides an error response. If you have the required permissions, the error response is DryRunOperation. \n Otherwise, it is UnauthorizedOperation.

", + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

", "smithy.api#xmlName": "dryRun" } } @@ -18169,7 +18175,7 @@ "target": "com.amazonaws.ec2#DescribeCustomerGatewaysResult" }, "traits": { - "smithy.api#documentation": "

Describes one or more of your VPN customer gateways.

\n

For more information, see AWS Site-to-Site VPN in the AWS Site-to-Site VPN User Guide.

", + "smithy.api#documentation": "

Describes one or more of your VPN customer gateways.

\n

For more information, see Amazon Web Services Site-to-Site VPN in the Amazon Web Services Site-to-Site VPN\n User Guide.

", "smithy.waiters#waitable": { "CustomerGatewayAvailable": { "acceptors": [ @@ -18222,7 +18228,7 @@ "Filters": { "target": "com.amazonaws.ec2#FilterList", "traits": { - "smithy.api#documentation": "

One or more filters.

\n ", + "smithy.api#documentation": "

One or more filters.

\n ", "smithy.api#xmlName": "Filter" } }, @@ -18230,7 +18236,7 @@ "target": "com.amazonaws.ec2#Boolean", "traits": { "aws.protocols#ec2QueryName": "DryRun", - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n and provides an error response. If you have the required permissions, the error response is DryRunOperation. \n Otherwise, it is UnauthorizedOperation.

", + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

", "smithy.api#xmlName": "dryRun" } } @@ -27354,7 +27360,7 @@ "target": "com.amazonaws.ec2#DescribeVpnConnectionsResult" }, "traits": { - "smithy.api#documentation": "

Describes one or more of your VPN connections.

\n

For more information, see AWS Site-to-Site VPN in the AWS Site-to-Site VPN User Guide.

", + "smithy.api#documentation": "

Describes one or more of your VPN connections.

\n

For more information, see Amazon Web Services Site-to-Site VPN in the Amazon Web Services Site-to-Site VPN\n User Guide.

", "smithy.waiters#waitable": { "VpnConnectionAvailable": { "acceptors": [ @@ -27425,7 +27431,7 @@ "Filters": { "target": "com.amazonaws.ec2#FilterList", "traits": { - "smithy.api#documentation": "

One or more filters.

\n ", + "smithy.api#documentation": "

One or more filters.

\n ", "smithy.api#xmlName": "Filter" } }, @@ -27440,7 +27446,7 @@ "target": "com.amazonaws.ec2#Boolean", "traits": { "aws.protocols#ec2QueryName": "DryRun", - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n and provides an error response. If you have the required permissions, the error response is DryRunOperation. \n Otherwise, it is UnauthorizedOperation.

", + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

", "smithy.api#xmlName": "dryRun" } } @@ -27474,7 +27480,7 @@ "target": "com.amazonaws.ec2#DescribeVpnGatewaysResult" }, "traits": { - "smithy.api#documentation": "

Describes one or more of your virtual private gateways.

\n

For more information, see AWS Site-to-Site VPN in the AWS Site-to-Site VPN User Guide.

" + "smithy.api#documentation": "

Describes one or more of your virtual private gateways.

\n

For more information, see Amazon Web Services Site-to-Site VPN in the Amazon Web Services Site-to-Site VPN\n User Guide.

" } }, "com.amazonaws.ec2#DescribeVpnGatewaysRequest": { @@ -27483,7 +27489,7 @@ "Filters": { "target": "com.amazonaws.ec2#FilterList", "traits": { - "smithy.api#documentation": "

One or more filters.

\n ", + "smithy.api#documentation": "

One or more filters.

\n ", "smithy.api#xmlName": "Filter" } }, @@ -27498,7 +27504,7 @@ "target": "com.amazonaws.ec2#Boolean", "traits": { "aws.protocols#ec2QueryName": "DryRun", - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n and provides an error response. If you have the required permissions, the error response is DryRunOperation. \n Otherwise, it is UnauthorizedOperation.

", + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

", "smithy.api#xmlName": "dryRun" } } @@ -27717,7 +27723,7 @@ "target": "com.amazonaws.ec2#DetachVpnGatewayRequest" }, "traits": { - "smithy.api#documentation": "

Detaches a virtual private gateway from a VPC. You do this if you're planning to turn off the VPC and not use it anymore. You can confirm a virtual private gateway has been completely detached from a VPC by describing the virtual private gateway (any attachments to the virtual private gateway are also described).

\n

You must wait for the attachment's state to switch to detached before\n you can delete the VPC or attach a different VPC to the virtual private gateway.

" + "smithy.api#documentation": "

Detaches a virtual private gateway from a VPC. You do this if you're planning to turn\n off the VPC and not use it anymore. You can confirm a virtual private gateway has been\n completely detached from a VPC by describing the virtual private gateway (any\n attachments to the virtual private gateway are also described).

\n

You must wait for the attachment's state to switch to detached before you\n can delete the VPC or attach a different VPC to the virtual private gateway.

" } }, "com.amazonaws.ec2#DetachVpnGatewayRequest": { @@ -27741,7 +27747,7 @@ "target": "com.amazonaws.ec2#Boolean", "traits": { "aws.protocols#ec2QueryName": "DryRun", - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n and provides an error response. If you have the required permissions, the error response is DryRunOperation. \n Otherwise, it is UnauthorizedOperation.

", + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

", "smithy.api#xmlName": "dryRun" } } @@ -28324,7 +28330,7 @@ "target": "com.amazonaws.ec2#DisableVgwRoutePropagationRequest" }, "traits": { - "smithy.api#documentation": "

Disables a virtual private gateway (VGW) from propagating routes to a specified route table of a VPC.

" + "smithy.api#documentation": "

Disables a virtual private gateway (VGW) from propagating routes to a specified route\n table of a VPC.

" } }, "com.amazonaws.ec2#DisableVgwRoutePropagationRequest": { @@ -28347,7 +28353,7 @@ "DryRun": { "target": "com.amazonaws.ec2#Boolean", "traits": { - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n\t\t\tand provides an error response. If you have the required permissions, the error response is DryRunOperation. \n\t\t\tOtherwise, it is UnauthorizedOperation.

" + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

" } } }, @@ -30427,7 +30433,7 @@ "target": "com.amazonaws.ec2#EnableVgwRoutePropagationRequest" }, "traits": { - "smithy.api#documentation": "

Enables a virtual private gateway (VGW) to propagate routes to the specified route table of a VPC.

" + "smithy.api#documentation": "

Enables a virtual private gateway (VGW) to propagate routes to the specified route\n table of a VPC.

" } }, "com.amazonaws.ec2#EnableVgwRoutePropagationRequest": { @@ -30436,21 +30442,21 @@ "GatewayId": { "target": "com.amazonaws.ec2#VpnGatewayId", "traits": { - "smithy.api#documentation": "

The ID of the virtual private gateway that is attached to a VPC. The virtual private gateway must be attached to the same VPC that the routing tables are associated with.

", + "smithy.api#documentation": "

The ID of the virtual private gateway that is attached to a VPC. The virtual private\n gateway must be attached to the same VPC that the routing tables are associated with.\n

", "smithy.api#required": {} } }, "RouteTableId": { "target": "com.amazonaws.ec2#RouteTableId", "traits": { - "smithy.api#documentation": "

The ID of the route table. The routing table must be associated with the same VPC that the virtual private gateway is attached to.

", + "smithy.api#documentation": "

The ID of the route table. The routing table must be associated with the same VPC that\n the virtual private gateway is attached to.

", "smithy.api#required": {} } }, "DryRun": { "target": "com.amazonaws.ec2#Boolean", "traits": { - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n\t\t\tand provides an error response. If you have the required permissions, the error response is DryRunOperation. \n\t\t\tOtherwise, it is UnauthorizedOperation.

" + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

" } } }, @@ -33144,6 +33150,16 @@ "smithy.api#box": {} } }, + "com.amazonaws.ec2#GVCDMaxResults": { + "type": "integer", + "traits": { + "smithy.api#box": {}, + "smithy.api#range": { + "min": 200, + "max": 1000 + } + } + }, "com.amazonaws.ec2#GatewayType": { "type": "string", "traits": { @@ -34796,6 +34812,124 @@ } } }, + "com.amazonaws.ec2#GetVpnConnectionDeviceSampleConfiguration": { + "type": "operation", + "input": { + "target": "com.amazonaws.ec2#GetVpnConnectionDeviceSampleConfigurationRequest" + }, + "output": { + "target": "com.amazonaws.ec2#GetVpnConnectionDeviceSampleConfigurationResult" + }, + "traits": { + "smithy.api#documentation": "

Download an AWS-provided sample configuration file to be used with the customer\n gateway device specified for your Site-to-Site VPN connection.

" + } + }, + "com.amazonaws.ec2#GetVpnConnectionDeviceSampleConfigurationRequest": { + "type": "structure", + "members": { + "VpnConnectionId": { + "target": "com.amazonaws.ec2#VpnConnectionId", + "traits": { + "smithy.api#documentation": "

The VpnConnectionId specifies the Site-to-Site VPN connection used for the sample\n configuration.

", + "smithy.api#required": {} + } + }, + "VpnConnectionDeviceTypeId": { + "target": "com.amazonaws.ec2#VpnConnectionDeviceTypeId", + "traits": { + "smithy.api#documentation": "

Device identifier provided by the GetVpnConnectionDeviceTypes API.

", + "smithy.api#required": {} + } + }, + "InternetKeyExchangeVersion": { + "target": "com.amazonaws.ec2#String", + "traits": { + "smithy.api#documentation": "

The IKE version to be used in the sample configuration file for your customer gateway\n device. You can specify one of the following versions: ikev1 or\n ikev2.

" + } + }, + "DryRun": { + "target": "com.amazonaws.ec2#Boolean", + "traits": { + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

" + } + } + } + }, + "com.amazonaws.ec2#GetVpnConnectionDeviceSampleConfigurationResult": { + "type": "structure", + "members": { + "VpnConnectionDeviceSampleConfiguration": { + "target": "com.amazonaws.ec2#VpnConnectionDeviceSampleConfiguration", + "traits": { + "aws.protocols#ec2QueryName": "VpnConnectionDeviceSampleConfiguration", + "smithy.api#documentation": "

Sample configuration file for the specified customer gateway device.

", + "smithy.api#xmlName": "vpnConnectionDeviceSampleConfiguration" + } + } + } + }, + "com.amazonaws.ec2#GetVpnConnectionDeviceTypes": { + "type": "operation", + "input": { + "target": "com.amazonaws.ec2#GetVpnConnectionDeviceTypesRequest" + }, + "output": { + "target": "com.amazonaws.ec2#GetVpnConnectionDeviceTypesResult" + }, + "traits": { + "smithy.api#documentation": "

Obtain a list of customer gateway devices for which sample configuration\n files can be provided. The request has no additional parameters. You can also see the\n list of device types with sample configuration files available under Your customer gateway\n device in the Amazon Web Services Site-to-Site VPN User Guide.

", + "smithy.api#paginated": { + "inputToken": "NextToken", + "outputToken": "NextToken", + "items": "VpnConnectionDeviceTypes", + "pageSize": "MaxResults" + } + } + }, + "com.amazonaws.ec2#GetVpnConnectionDeviceTypesRequest": { + "type": "structure", + "members": { + "MaxResults": { + "target": "com.amazonaws.ec2#GVCDMaxResults", + "traits": { + "smithy.api#documentation": "

The maximum number of results returned by GetVpnConnectionDeviceTypes in\n paginated output. When this parameter is used, GetVpnConnectionDeviceTypes\n only returns MaxResults results in a single page along with a\n NextToken response element. The remaining results of the initial\n request can be seen by sending another GetVpnConnectionDeviceTypes request\n with the returned NextToken value. This value can be between 200 and 1000.\n If this parameter is not used, then GetVpnConnectionDeviceTypes returns all\n results.

" + } + }, + "NextToken": { + "target": "com.amazonaws.ec2#NextToken", + "traits": { + "smithy.api#documentation": "

The NextToken value returned from a previous paginated\n GetVpnConnectionDeviceTypes request where MaxResults was\n used and the results exceeded the value of that parameter. Pagination continues from the\n end of the previous results that returned the NextToken value. This value\n is null when there are no more results to return.

" + } + }, + "DryRun": { + "target": "com.amazonaws.ec2#Boolean", + "traits": { + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

" + } + } + } + }, + "com.amazonaws.ec2#GetVpnConnectionDeviceTypesResult": { + "type": "structure", + "members": { + "VpnConnectionDeviceTypes": { + "target": "com.amazonaws.ec2#VpnConnectionDeviceTypeList", + "traits": { + "aws.protocols#ec2QueryName": "VpnConnectionDeviceTypeSet", + "smithy.api#documentation": "

List of customer gateway devices that have a sample configuration file available for\n use.

", + "smithy.api#xmlName": "vpnConnectionDeviceTypeSet" + } + }, + "NextToken": { + "target": "com.amazonaws.ec2#NextToken", + "traits": { + "aws.protocols#ec2QueryName": "NextToken", + "smithy.api#documentation": "

The NextToken value to include in a future\n GetVpnConnectionDeviceTypes request. When the results of a\n GetVpnConnectionDeviceTypes request exceed MaxResults,\n this value can be used to retrieve the next page of results. This value is null when\n there are no more results to return.

", + "smithy.api#xmlName": "nextToken" + } + } + } + }, "com.amazonaws.ec2#GpuDeviceCount": { "type": "integer", "traits": { @@ -34906,7 +35040,7 @@ "com.amazonaws.ec2#GroupIdStringList": { "type": "list", "member": { - "target": "com.amazonaws.ec2#String", + "target": "com.amazonaws.ec2#SecurityGroupId", "traits": { "smithy.api#xmlName": "groupId" } @@ -36386,7 +36520,7 @@ "CertificateRevocationList": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The client certificate revocation list file. For more information, see Generate a Client Certificate Revocation List in the\n\t\t\t\tAWS Client VPN Administrator Guide.

", + "smithy.api#documentation": "

The client certificate revocation list file. For more information, see Generate a Client Certificate Revocation List in the\n\t\t\t\tClient VPN Administrator Guide.

", "smithy.api#required": {} } }, @@ -37973,7 +38107,7 @@ "target": "com.amazonaws.ec2#LicenseList", "traits": { "aws.protocols#ec2QueryName": "LicenseSet", - "smithy.api#documentation": "

The license configurations.

", + "smithy.api#documentation": "

The license configurations for the instance.

", "smithy.api#xmlName": "licenseSet" } }, @@ -37997,9 +38131,33 @@ "target": "com.amazonaws.ec2#BootModeValues", "traits": { "aws.protocols#ec2QueryName": "BootMode", - "smithy.api#documentation": "

The boot mode of the instance. For more information, see Boot modes in the\n Amazon EC2 User Guide.

", + "smithy.api#documentation": "

The boot mode of the instance. For more information, see Boot modes in the\n Amazon EC2 User Guide.

", "smithy.api#xmlName": "bootMode" } + }, + "PlatformDetails": { + "target": "com.amazonaws.ec2#String", + "traits": { + "aws.protocols#ec2QueryName": "PlatformDetails", + "smithy.api#documentation": "

The platform details value for the instance. For more information, see AMI\n billing information fields in the\n Amazon EC2 User Guide.

", + "smithy.api#xmlName": "platformDetails" + } + }, + "UsageOperation": { + "target": "com.amazonaws.ec2#String", + "traits": { + "aws.protocols#ec2QueryName": "UsageOperation", + "smithy.api#documentation": "

The usage operation value for the instance. For more information, see AMI billing information fields\n in the Amazon EC2 User Guide.

", + "smithy.api#xmlName": "usageOperation" + } + }, + "UsageOperationUpdateTime": { + "target": "com.amazonaws.ec2#MillisecondDateTime", + "traits": { + "aws.protocols#ec2QueryName": "UsageOperationUpdateTime", + "smithy.api#documentation": "

The time that the usage operation was last updated.

", + "smithy.api#xmlName": "usageOperationUpdateTime" + } } }, "traits": { @@ -45987,7 +46145,7 @@ "ServerCertificateArn": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The ARN of the server certificate to be used. The server certificate must be provisioned in AWS Certificate Manager (ACM).

" + "smithy.api#documentation": "

The ARN of the server certificate to be used. The server certificate must be provisioned in \n\t\t\tCertificate Manager (ACM).

" } }, "ConnectionLogOptions": { @@ -46017,7 +46175,7 @@ "SplitTunnel": { "target": "com.amazonaws.ec2#Boolean", "traits": { - "smithy.api#documentation": "

Indicates whether the VPN is split-tunnel.

\n

For information about split-tunnel VPN endpoints, see Split-Tunnel AWS Client VPN Endpoint in the AWS\n Client VPN Administrator Guide.

" + "smithy.api#documentation": "

Indicates whether the VPN is split-tunnel.

\n

For information about split-tunnel VPN endpoints, see Split-tunnel Client VPN endpoint in the \n \tClient VPN Administrator Guide.

" } }, "DryRun": { @@ -46996,7 +47154,7 @@ "target": "com.amazonaws.ec2#ModifyInstancePlacementResult" }, "traits": { - "smithy.api#documentation": "

Modifies the placement attributes for a specified instance. You can do the\n following:

\n \n

At least one attribute for affinity, host ID, tenancy, or placement group name must\n be specified in the request. Affinity and tenancy can be modified in the same\n request.

\n

To modify the host ID, tenancy, placement group, or partition for an instance, the\n instance must be in the stopped state.

" + "smithy.api#documentation": "

Modifies the placement attributes for a specified instance. You can do the\n following:

\n \n

At least one attribute for affinity, host ID, tenancy, or placement group name must\n be specified in the request. Affinity and tenancy can be modified in the same\n request.

\n

To modify the host ID, tenancy, placement group, or partition for an instance, the\n instance must be in the stopped state.

" } }, "com.amazonaws.ec2#ModifyInstancePlacementRequest": { @@ -47037,7 +47195,7 @@ "target": "com.amazonaws.ec2#HostTenancy", "traits": { "aws.protocols#ec2QueryName": "Tenancy", - "smithy.api#documentation": "

The tenancy for the instance.

\n \n

For T3 instances, you can't change the tenancy from dedicated to \n host, or from host to dedicated. Attempting \n to make one of these unsupported tenancy changes results in the InvalidTenancy \n error code.

", + "smithy.api#documentation": "

The tenancy for the instance.

\n \n \n

For T3 instances, you can't change the tenancy from dedicated \n to host, or from host to dedicated. \n Attempting to make one of these unsupported tenancy changes results in the \n InvalidTenancy error code.

\n ", "smithy.api#xmlName": "tenancy" } }, @@ -48650,7 +48808,7 @@ "target": "com.amazonaws.ec2#ModifyVpnConnectionResult" }, "traits": { - "smithy.api#documentation": "

Modifies the customer gateway or the target gateway of an AWS Site-to-Site VPN connection. To modify the target gateway, the following migration\n options are available:

\n \n

Before you perform the migration to the new gateway, you must configure the new gateway. Use CreateVpnGateway to create a virtual private gateway, or CreateTransitGateway to create a transit gateway.

\n

This step is required when you migrate from a virtual private gateway with static routes to\n a transit gateway.

\n

You must delete the static routes before you migrate to the new gateway.

\n \n

Keep a copy of the static route before you delete it. You will need to add back these\n routes to the transit gateway after the VPN connection migration is complete.

\n \n

After you migrate to the new gateway, you might need to modify your VPC route table. Use CreateRoute and DeleteRoute to make the changes described in VPN Gateway Target Modification Required VPC Route Table Updates in the AWS Site-to-Site VPN User Guide.

\n

\n When the new gateway is a transit gateway, modify the transit gateway route table to allow traffic between the VPC and the AWS Site-to-Site VPN connection. Use CreateTransitGatewayRoute to add the routes.

\n \n

If you deleted VPN static routes, you must add the static routes to the transit gateway\n route table.

\n

After you perform this operation, the AWS VPN endpoint's IP addresses on the AWS side and\n the tunnel options remain intact. Your AWS Site-to-Site VPN connection will be temporarily unavailable\n for a brief period while we provision the new endpoints.

" + "smithy.api#documentation": "

Modifies the customer gateway or the target gateway of an Amazon Web Services Site-to-Site VPN connection. To\n modify the target gateway, the following migration options are available:

\n \n

Before you perform the migration to the new gateway, you must configure the new\n gateway. Use CreateVpnGateway to create a virtual private gateway, or\n CreateTransitGateway to create a transit gateway.

\n

This step is required when you migrate from a virtual private gateway with static\n routes to a transit gateway.

\n

You must delete the static routes before you migrate to the new gateway.

\n\n

Keep a copy of the static route before you delete it. You will need to add back these\n routes to the transit gateway after the VPN connection migration is complete.

\n\n

After you migrate to the new gateway, you might need to modify your VPC route table.\n Use CreateRoute and DeleteRoute to make the changes\n described in Update VPC route\n tables in the Amazon Web Services Site-to-Site VPN User Guide.

\n

When the new gateway is a transit gateway, modify the transit gateway route table to\n allow traffic between the VPC and the Amazon Web Services Site-to-Site VPN connection.\n Use CreateTransitGatewayRoute to add the routes.

\n

If you deleted VPN static routes, you must add the static routes to the transit\n gateway route table.

\n

After you perform this operation, the VPN endpoint's IP addresses on the Amazon Web Services side and the tunnel options remain intact. Your Amazon Web Services Site-to-Site VPN connection will\n be temporarily unavailable for a brief period while we provision the new\n endpoints.

" } }, "com.amazonaws.ec2#ModifyVpnConnectionOptions": { @@ -48662,7 +48820,7 @@ "target": "com.amazonaws.ec2#ModifyVpnConnectionOptionsResult" }, "traits": { - "smithy.api#documentation": "

Modifies the connection options for your Site-to-Site VPN connection.

\n

When you modify the VPN connection options, the VPN endpoint IP addresses on the AWS side do not change, and the tunnel options do not change. Your VPN connection will be temporarily unavailable for a brief period while the VPN connection is updated.

" + "smithy.api#documentation": "

Modifies the connection options for your Site-to-Site VPN connection.

\n

When you modify the VPN connection options, the VPN endpoint IP addresses on the\n Amazon Web Services side do not change, and the tunnel options do not change. Your\n VPN connection will be temporarily unavailable for a brief period while the VPN\n connection is updated.

" } }, "com.amazonaws.ec2#ModifyVpnConnectionOptionsRequest": { @@ -48671,7 +48829,7 @@ "VpnConnectionId": { "target": "com.amazonaws.ec2#VpnConnectionId", "traits": { - "smithy.api#documentation": "

The ID of the Site-to-Site VPN connection.\n

", + "smithy.api#documentation": "

The ID of the Site-to-Site VPN connection.

", "smithy.api#required": {} } }, @@ -48684,7 +48842,7 @@ "RemoteIpv4NetworkCidr": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The IPv4 CIDR on the AWS side of the VPN connection.

\n

Default: 0.0.0.0/0\n

" + "smithy.api#documentation": "

The IPv4 CIDR on the Amazon Web Services side of the VPN connection.

\n

Default: 0.0.0.0/0\n

" } }, "LocalIpv6NetworkCidr": { @@ -48696,7 +48854,7 @@ "RemoteIpv6NetworkCidr": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The IPv6 CIDR on the AWS side of the VPN connection.

\n

Default: ::/0\n

" + "smithy.api#documentation": "

The IPv6 CIDR on the Amazon Web Services side of the VPN connection.

\n

Default: ::/0\n

" } }, "DryRun": { @@ -48744,13 +48902,13 @@ "VpnGatewayId": { "target": "com.amazonaws.ec2#VpnGatewayId", "traits": { - "smithy.api#documentation": "

The ID of the virtual private gateway at the AWS side of the VPN connection.

" + "smithy.api#documentation": "

The ID of the virtual private gateway at the Amazon Web Services side of the VPN\n connection.

" } }, "DryRun": { "target": "com.amazonaws.ec2#Boolean", "traits": { - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n and provides an error response. If you have the required permissions, the error response is DryRunOperation. \n Otherwise, it is UnauthorizedOperation.

" + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

" } } } @@ -48785,7 +48943,7 @@ "VpnConnectionId": { "target": "com.amazonaws.ec2#VpnConnectionId", "traits": { - "smithy.api#documentation": "

The ID of the AWS Site-to-Site VPN connection.

", + "smithy.api#documentation": "

The ID of the Amazon Web Services Site-to-Site VPN connection.

", "smithy.api#required": {} } }, @@ -48799,7 +48957,7 @@ "DryRun": { "target": "com.amazonaws.ec2#Boolean", "traits": { - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n and provides an error response. If you have the required permissions, the error response is DryRunOperation. \n Otherwise, it is UnauthorizedOperation.

" + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

" } } } @@ -48825,7 +48983,7 @@ "target": "com.amazonaws.ec2#ModifyVpnTunnelOptionsResult" }, "traits": { - "smithy.api#documentation": "

Modifies the options for a VPN tunnel in an AWS Site-to-Site VPN connection. You can modify\n multiple options for a tunnel in a single request, but you can only modify one tunnel at\n a time. For more information, see Site-to-Site VPN Tunnel Options for Your Site-to-Site VPN\n Connection in the AWS Site-to-Site VPN User Guide.

" + "smithy.api#documentation": "

Modifies the options for a VPN tunnel in an Amazon Web Services Site-to-Site VPN connection. You can modify\n multiple options for a tunnel in a single request, but you can only modify one tunnel at\n a time. For more information, see Site-to-Site VPN tunnel options for your Site-to-Site VPN\n connection in the Amazon Web Services Site-to-Site VPN User Guide.

" } }, "com.amazonaws.ec2#ModifyVpnTunnelOptionsRequest": { @@ -48834,7 +48992,7 @@ "VpnConnectionId": { "target": "com.amazonaws.ec2#VpnConnectionId", "traits": { - "smithy.api#documentation": "

The ID of the AWS Site-to-Site VPN connection.

", + "smithy.api#documentation": "

The ID of the Amazon Web Services Site-to-Site VPN connection.

", "smithy.api#required": {} } }, @@ -48855,7 +49013,7 @@ "DryRun": { "target": "com.amazonaws.ec2#Boolean", "traits": { - "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n and provides an error response. If you have the required permissions, the error response is DryRunOperation. \n Otherwise, it is UnauthorizedOperation.

" + "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually\n making the request, and provides an error response. If you have the required\n permissions, the error response is DryRunOperation. Otherwise, it is\n UnauthorizedOperation.

" } } } @@ -48878,13 +49036,13 @@ "TunnelInsideCidr": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The range of inside IPv4 addresses for the tunnel. Any specified CIDR blocks must be unique\n across all VPN connections that use the same virtual private gateway.

\n

Constraints: A size /30 CIDR block from the 169.254.0.0/16 range. The\n following CIDR blocks are reserved and cannot be used:

\n " + "smithy.api#documentation": "

The range of inside IPv4 addresses for the tunnel. Any specified CIDR blocks must be\n unique across all VPN connections that use the same virtual private gateway.

\n

Constraints: A size /30 CIDR block from the 169.254.0.0/16 range. The\n following CIDR blocks are reserved and cannot be used:

\n " } }, "TunnelInsideIpv6Cidr": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The range of inside IPv6 addresses for the tunnel. Any specified CIDR blocks must be unique across all VPN connections that use the same transit gateway.

\n

Constraints: A size /126 CIDR block from the local fd00::/8 range.

" + "smithy.api#documentation": "

The range of inside IPv6 addresses for the tunnel. Any specified CIDR blocks must be\n unique across all VPN connections that use the same transit gateway.

\n

Constraints: A size /126 CIDR block from the local fd00::/8 range.

" } }, "PreSharedKey": { @@ -48902,19 +49060,19 @@ "Phase2LifetimeSeconds": { "target": "com.amazonaws.ec2#Integer", "traits": { - "smithy.api#documentation": "

The lifetime for phase 2 of the IKE negotiation, in seconds.

\n

Constraints: A value between 900 and 3,600. The value must be less than the value for Phase1LifetimeSeconds.

\n

Default: 3600\n

" + "smithy.api#documentation": "

The lifetime for phase 2 of the IKE negotiation, in seconds.

\n

Constraints: A value between 900 and 3,600. The value must be less than the value for\n Phase1LifetimeSeconds.

\n

Default: 3600\n

" } }, "RekeyMarginTimeSeconds": { "target": "com.amazonaws.ec2#Integer", "traits": { - "smithy.api#documentation": "

The margin time, in seconds, before the phase 2 lifetime expires, during which the AWS side of the VPN connection performs an IKE rekey. The exact time of the rekey is randomly selected based on the value for RekeyFuzzPercentage.

\n

Constraints: A value between 60 and half of Phase2LifetimeSeconds.

\n

Default: 540\n

" + "smithy.api#documentation": "

The margin time, in seconds, before the phase 2 lifetime expires, during which the\n Amazon Web Services side of the VPN connection performs an IKE rekey. The exact time\n of the rekey is randomly selected based on the value for\n RekeyFuzzPercentage.

\n

Constraints: A value between 60 and half of Phase2LifetimeSeconds.

\n

Default: 540\n

" } }, "RekeyFuzzPercentage": { "target": "com.amazonaws.ec2#Integer", "traits": { - "smithy.api#documentation": "

The percentage of the rekey window (determined by RekeyMarginTimeSeconds) during which the rekey time is randomly selected.

\n

Constraints: A value between 0 and 100.

\n

Default: 100\n

" + "smithy.api#documentation": "

The percentage of the rekey window (determined by RekeyMarginTimeSeconds)\n during which the rekey time is randomly selected.

\n

Constraints: A value between 0 and 100.

\n

Default: 100\n

" } }, "ReplayWindowSize": { @@ -48932,48 +49090,48 @@ "DPDTimeoutAction": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The action to take after DPD timeout occurs. Specify restart to restart the IKE initiation. Specify clear to end the IKE session.

\n

Valid Values: clear | none | restart\n

\n

Default: clear\n

" + "smithy.api#documentation": "

The action to take after DPD timeout occurs. Specify restart to restart\n the IKE initiation. Specify clear to end the IKE session.

\n

Valid Values: clear | none | restart\n

\n

Default: clear\n

" } }, "Phase1EncryptionAlgorithms": { "target": "com.amazonaws.ec2#Phase1EncryptionAlgorithmsRequestList", "traits": { - "smithy.api#documentation": "

One or more encryption algorithms that are permitted for the VPN tunnel for phase 1 IKE negotiations.

\n

Valid values: AES128 | AES256 | AES128-GCM-16 | AES256-GCM-16\n

", + "smithy.api#documentation": "

One or more encryption algorithms that are permitted for the VPN tunnel for phase 1\n IKE negotiations.

\n

Valid values: AES128 | AES256 | AES128-GCM-16 |\n AES256-GCM-16\n

", "smithy.api#xmlName": "Phase1EncryptionAlgorithm" } }, "Phase2EncryptionAlgorithms": { "target": "com.amazonaws.ec2#Phase2EncryptionAlgorithmsRequestList", "traits": { - "smithy.api#documentation": "

One or more encryption algorithms that are permitted for the VPN tunnel for phase 2 IKE negotiations.

\n

Valid values: AES128 | AES256 | AES128-GCM-16 | AES256-GCM-16\n

", + "smithy.api#documentation": "

One or more encryption algorithms that are permitted for the VPN tunnel for phase 2\n IKE negotiations.

\n

Valid values: AES128 | AES256 | AES128-GCM-16 |\n AES256-GCM-16\n

", "smithy.api#xmlName": "Phase2EncryptionAlgorithm" } }, "Phase1IntegrityAlgorithms": { "target": "com.amazonaws.ec2#Phase1IntegrityAlgorithmsRequestList", "traits": { - "smithy.api#documentation": "

One or more integrity algorithms that are permitted for the VPN tunnel for phase 1 IKE negotiations.

\n

Valid values: SHA1 | SHA2-256 | SHA2-384 | SHA2-512\n

", + "smithy.api#documentation": "

One or more integrity algorithms that are permitted for the VPN tunnel for phase 1 IKE\n negotiations.

\n

Valid values: SHA1 | SHA2-256 | SHA2-384 |\n SHA2-512\n

", "smithy.api#xmlName": "Phase1IntegrityAlgorithm" } }, "Phase2IntegrityAlgorithms": { "target": "com.amazonaws.ec2#Phase2IntegrityAlgorithmsRequestList", "traits": { - "smithy.api#documentation": "

One or more integrity algorithms that are permitted for the VPN tunnel for phase 2 IKE negotiations.

\n

Valid values: SHA1 | SHA2-256 | SHA2-384 | SHA2-512\n

", + "smithy.api#documentation": "

One or more integrity algorithms that are permitted for the VPN tunnel for phase 2 IKE\n negotiations.

\n

Valid values: SHA1 | SHA2-256 | SHA2-384 |\n SHA2-512\n

", "smithy.api#xmlName": "Phase2IntegrityAlgorithm" } }, "Phase1DHGroupNumbers": { "target": "com.amazonaws.ec2#Phase1DHGroupNumbersRequestList", "traits": { - "smithy.api#documentation": "

One or more Diffie-Hellman group numbers that are permitted for the VPN tunnel for phase 1 IKE negotiations.

\n

Valid values: 2 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24\n

", + "smithy.api#documentation": "

One or more Diffie-Hellman group numbers that are permitted for the VPN tunnel for\n phase 1 IKE negotiations.

\n

Valid values: 2 | 14 | 15 | 16 |\n 17 | 18 | 19 | 20 |\n 21 | 22 | 23 | 24\n

", "smithy.api#xmlName": "Phase1DHGroupNumber" } }, "Phase2DHGroupNumbers": { "target": "com.amazonaws.ec2#Phase2DHGroupNumbersRequestList", "traits": { - "smithy.api#documentation": "

One or more Diffie-Hellman group numbers that are permitted for the VPN tunnel for phase 2 IKE negotiations.

\n

Valid values: 2 | 5 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24\n

", + "smithy.api#documentation": "

One or more Diffie-Hellman group numbers that are permitted for the VPN tunnel for\n phase 2 IKE negotiations.

\n

Valid values: 2 | 5 | 14 | 15 |\n 16 | 17 | 18 | 19 |\n 20 | 21 | 22 | 23 |\n 24\n

", "smithy.api#xmlName": "Phase2DHGroupNumber" } }, @@ -48987,12 +49145,12 @@ "StartupAction": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The action to take when the establishing the tunnel for the VPN connection. By default, your customer gateway device must initiate the IKE negotiation and bring up the tunnel. Specify start for AWS to initiate the IKE negotiation.

\n

Valid Values: add | start\n

\n

Default: add\n

" + "smithy.api#documentation": "

The action to take when the establishing the tunnel for the VPN connection. By\n default, your customer gateway device must initiate the IKE negotiation and bring up the\n tunnel. Specify start for Amazon Web Services to initiate the IKE\n negotiation.

\n

Valid Values: add | start\n

\n

Default: add\n

" } } }, "traits": { - "smithy.api#documentation": "

The AWS Site-to-Site VPN tunnel options to modify.

" + "smithy.api#documentation": "

The Amazon Web Services Site-to-Site VPN tunnel options to modify.

" } }, "com.amazonaws.ec2#MonitorInstances": { @@ -51273,7 +51431,7 @@ } }, "traits": { - "smithy.api#documentation": "

Specifies a Diffie-Hellman group number for the VPN tunnel for phase 1 IKE negotiations.

" + "smithy.api#documentation": "

Specifies a Diffie-Hellman group number for the VPN tunnel for phase 1 IKE\n negotiations.

" } }, "com.amazonaws.ec2#Phase1EncryptionAlgorithmsList": { @@ -51321,7 +51479,7 @@ } }, "traits": { - "smithy.api#documentation": "

Specifies the encryption algorithm for the VPN tunnel for phase 1 IKE negotiations.

" + "smithy.api#documentation": "

Specifies the encryption algorithm for the VPN tunnel for phase 1 IKE\n negotiations.

" } }, "com.amazonaws.ec2#Phase1IntegrityAlgorithmsList": { @@ -51369,7 +51527,7 @@ } }, "traits": { - "smithy.api#documentation": "

Specifies the integrity algorithm for the VPN tunnel for phase 1 IKE negotiations.

" + "smithy.api#documentation": "

Specifies the integrity algorithm for the VPN tunnel for phase 1 IKE\n negotiations.

" } }, "com.amazonaws.ec2#Phase2DHGroupNumbersList": { @@ -51417,7 +51575,7 @@ } }, "traits": { - "smithy.api#documentation": "

Specifies a Diffie-Hellman group number for the VPN tunnel for phase 2 IKE negotiations.

" + "smithy.api#documentation": "

Specifies a Diffie-Hellman group number for the VPN tunnel for phase 2 IKE\n negotiations.

" } }, "com.amazonaws.ec2#Phase2EncryptionAlgorithmsList": { @@ -51465,7 +51623,7 @@ } }, "traits": { - "smithy.api#documentation": "

Specifies the encryption algorithm for the VPN tunnel for phase 2 IKE negotiations.

" + "smithy.api#documentation": "

Specifies the encryption algorithm for the VPN tunnel for phase 2 IKE\n negotiations.

" } }, "com.amazonaws.ec2#Phase2IntegrityAlgorithmsList": { @@ -51513,7 +51671,7 @@ } }, "traits": { - "smithy.api#documentation": "

Specifies the integrity algorithm for the VPN tunnel for phase 2 IKE negotiations.

" + "smithy.api#documentation": "

Specifies the integrity algorithm for the VPN tunnel for phase 2 IKE\n negotiations.

" } }, "com.amazonaws.ec2#Placement": { @@ -51536,7 +51694,7 @@ } }, "GroupName": { - "target": "com.amazonaws.ec2#String", + "target": "com.amazonaws.ec2#PlacementGroupName", "traits": { "aws.protocols#ec2QueryName": "GroupName", "smithy.api#documentation": "

The name of the placement group the instance is in.

", @@ -59034,14 +59192,6 @@ "smithy.api#required": {} } }, - "Filters": { - "target": "com.amazonaws.ec2#FilterList", - "traits": { - "smithy.api#documentation": "

One or more filters.

", - "smithy.api#required": {}, - "smithy.api#xmlName": "Filter" - } - }, "MaxResults": { "target": "com.amazonaws.ec2#MaxResults", "traits": { @@ -59059,6 +59209,14 @@ "traits": { "smithy.api#documentation": "

Checks whether you have the required permissions for the action, without actually making the request, \n and provides an error response. If you have the required permissions, the error response is DryRunOperation. \n Otherwise, it is UnauthorizedOperation.

" } + }, + "Filters": { + "target": "com.amazonaws.ec2#FilterList", + "traits": { + "smithy.api#documentation": "

One or more filters.

", + "smithy.api#required": {}, + "smithy.api#xmlName": "Filter" + } } } }, @@ -66328,7 +66486,7 @@ "target": "com.amazonaws.ec2#Integer", "traits": { "aws.protocols#ec2QueryName": "RekeyMarginTimeSeconds", - "smithy.api#documentation": "

The margin time, in seconds, before the phase 2 lifetime expires, during which the AWS side of the VPN connection performs an IKE rekey.

", + "smithy.api#documentation": "

The margin time, in seconds, before the phase 2 lifetime expires, during which the\n Amazon Web Services side of the VPN connection performs an IKE rekey.

", "smithy.api#xmlName": "rekeyMarginTimeSeconds" } }, @@ -66336,7 +66494,7 @@ "target": "com.amazonaws.ec2#Integer", "traits": { "aws.protocols#ec2QueryName": "RekeyFuzzPercentage", - "smithy.api#documentation": "

The percentage of the rekey window determined by RekeyMarginTimeSeconds during which the rekey time is randomly selected.

", + "smithy.api#documentation": "

The percentage of the rekey window determined by RekeyMarginTimeSeconds\n during which the rekey time is randomly selected.

", "smithy.api#xmlName": "rekeyFuzzPercentage" } }, @@ -66368,7 +66526,7 @@ "target": "com.amazonaws.ec2#Phase1EncryptionAlgorithmsList", "traits": { "aws.protocols#ec2QueryName": "Phase1EncryptionAlgorithmSet", - "smithy.api#documentation": "

The permitted encryption algorithms for the VPN tunnel for phase 1 IKE negotiations.

", + "smithy.api#documentation": "

The permitted encryption algorithms for the VPN tunnel for phase 1 IKE\n negotiations.

", "smithy.api#xmlName": "phase1EncryptionAlgorithmSet" } }, @@ -66376,7 +66534,7 @@ "target": "com.amazonaws.ec2#Phase2EncryptionAlgorithmsList", "traits": { "aws.protocols#ec2QueryName": "Phase2EncryptionAlgorithmSet", - "smithy.api#documentation": "

The permitted encryption algorithms for the VPN tunnel for phase 2 IKE negotiations.

", + "smithy.api#documentation": "

The permitted encryption algorithms for the VPN tunnel for phase 2 IKE\n negotiations.

", "smithy.api#xmlName": "phase2EncryptionAlgorithmSet" } }, @@ -66384,7 +66542,7 @@ "target": "com.amazonaws.ec2#Phase1IntegrityAlgorithmsList", "traits": { "aws.protocols#ec2QueryName": "Phase1IntegrityAlgorithmSet", - "smithy.api#documentation": "

The permitted integrity algorithms for the VPN tunnel for phase 1 IKE negotiations.

", + "smithy.api#documentation": "

The permitted integrity algorithms for the VPN tunnel for phase 1 IKE\n negotiations.

", "smithy.api#xmlName": "phase1IntegrityAlgorithmSet" } }, @@ -66392,7 +66550,7 @@ "target": "com.amazonaws.ec2#Phase2IntegrityAlgorithmsList", "traits": { "aws.protocols#ec2QueryName": "Phase2IntegrityAlgorithmSet", - "smithy.api#documentation": "

The permitted integrity algorithms for the VPN tunnel for phase 2 IKE negotiations.

", + "smithy.api#documentation": "

The permitted integrity algorithms for the VPN tunnel for phase 2 IKE\n negotiations.

", "smithy.api#xmlName": "phase2IntegrityAlgorithmSet" } }, @@ -66400,7 +66558,7 @@ "target": "com.amazonaws.ec2#Phase1DHGroupNumbersList", "traits": { "aws.protocols#ec2QueryName": "Phase1DHGroupNumberSet", - "smithy.api#documentation": "

The permitted Diffie-Hellman group numbers for the VPN tunnel for phase 1 IKE negotiations.

", + "smithy.api#documentation": "

The permitted Diffie-Hellman group numbers for the VPN tunnel for phase 1 IKE\n negotiations.

", "smithy.api#xmlName": "phase1DHGroupNumberSet" } }, @@ -66408,7 +66566,7 @@ "target": "com.amazonaws.ec2#Phase2DHGroupNumbersList", "traits": { "aws.protocols#ec2QueryName": "Phase2DHGroupNumberSet", - "smithy.api#documentation": "

The permitted Diffie-Hellman group numbers for the VPN tunnel for phase 2 IKE negotiations.

", + "smithy.api#documentation": "

The permitted Diffie-Hellman group numbers for the VPN tunnel for phase 2 IKE\n negotiations.

", "smithy.api#xmlName": "phase2DHGroupNumberSet" } }, @@ -67219,7 +67377,7 @@ "target": "com.amazonaws.ec2#String", "traits": { "aws.protocols#ec2QueryName": "OutsideIpAddress", - "smithy.api#documentation": "

The Internet-routable IP address of the virtual private gateway's outside interface.

", + "smithy.api#documentation": "

The Internet-routable IP address of the virtual private gateway's outside\n interface.

", "smithy.api#xmlName": "outsideIpAddress" } }, @@ -69054,7 +69212,7 @@ "target": "com.amazonaws.ec2#String", "traits": { "aws.protocols#ec2QueryName": "CustomerGatewayConfiguration", - "smithy.api#documentation": "

The configuration information for the VPN connection's customer gateway (in the native XML\n format). This element is always present in the CreateVpnConnection response; however,\n it's present in the DescribeVpnConnections response only if the VPN connection is in\n the pending or available state.

", + "smithy.api#documentation": "

The configuration information for the VPN connection's customer gateway (in the native\n XML format). This element is always present in the CreateVpnConnection\n response; however, it's present in the DescribeVpnConnections response\n only if the VPN connection is in the pending or available\n state.

", "smithy.api#xmlName": "customerGatewayConfiguration" } }, @@ -69070,7 +69228,7 @@ "target": "com.amazonaws.ec2#String", "traits": { "aws.protocols#ec2QueryName": "Category", - "smithy.api#documentation": "

The category of the VPN connection. A value of VPN indicates an AWS VPN\n\t\t\tconnection. A value of VPN-Classic indicates an AWS Classic VPN connection.

", + "smithy.api#documentation": "

The category of the VPN connection. A value of VPN indicates an Amazon Web Services VPN connection. A value of VPN-Classic indicates an Amazon Web Services Classic VPN connection.

", "smithy.api#xmlName": "category" } }, @@ -69102,7 +69260,7 @@ "target": "com.amazonaws.ec2#String", "traits": { "aws.protocols#ec2QueryName": "VpnGatewayId", - "smithy.api#documentation": "

The ID of the virtual private gateway at the AWS side of the VPN connection.

", + "smithy.api#documentation": "

The ID of the virtual private gateway at the Amazon Web Services side of the VPN\n connection.

", "smithy.api#xmlName": "vpnGatewayId" } }, @@ -69151,6 +69309,64 @@ "smithy.api#documentation": "

Describes a VPN connection.

" } }, + "com.amazonaws.ec2#VpnConnectionDeviceSampleConfiguration": { + "type": "string", + "traits": { + "smithy.api#sensitive": {} + } + }, + "com.amazonaws.ec2#VpnConnectionDeviceType": { + "type": "structure", + "members": { + "VpnConnectionDeviceTypeId": { + "target": "com.amazonaws.ec2#String", + "traits": { + "aws.protocols#ec2QueryName": "VpnConnectionDeviceTypeId", + "smithy.api#documentation": "

Customer gateway device identifier.

", + "smithy.api#xmlName": "vpnConnectionDeviceTypeId" + } + }, + "Vendor": { + "target": "com.amazonaws.ec2#String", + "traits": { + "aws.protocols#ec2QueryName": "Vendor", + "smithy.api#documentation": "

Customer gateway device vendor.

", + "smithy.api#xmlName": "vendor" + } + }, + "Platform": { + "target": "com.amazonaws.ec2#String", + "traits": { + "aws.protocols#ec2QueryName": "Platform", + "smithy.api#documentation": "

Customer gateway device platform.

", + "smithy.api#xmlName": "platform" + } + }, + "Software": { + "target": "com.amazonaws.ec2#String", + "traits": { + "aws.protocols#ec2QueryName": "Software", + "smithy.api#documentation": "

Customer gateway device software version.

", + "smithy.api#xmlName": "software" + } + } + }, + "traits": { + "smithy.api#documentation": "

List of customer gateway devices that have a sample configuration file available for\n use. You can also see the list of device types with sample configuration files available\n under Your customer\n gateway device in the Amazon Web Services Site-to-Site VPN User Guide.

" + } + }, + "com.amazonaws.ec2#VpnConnectionDeviceTypeId": { + "type": "string" + }, + "com.amazonaws.ec2#VpnConnectionDeviceTypeList": { + "type": "list", + "member": { + "target": "com.amazonaws.ec2#VpnConnectionDeviceType", + "traits": { + "smithy.api#xmlName": "item" + } + } + }, "com.amazonaws.ec2#VpnConnectionId": { "type": "string" }, @@ -69187,7 +69403,7 @@ "target": "com.amazonaws.ec2#Boolean", "traits": { "aws.protocols#ec2QueryName": "StaticRoutesOnly", - "smithy.api#documentation": "

Indicates whether the VPN connection uses static routes only. Static routes must be used for devices that don't support BGP.

", + "smithy.api#documentation": "

Indicates whether the VPN connection uses static routes only. Static routes must be\n used for devices that don't support BGP.

", "smithy.api#xmlName": "staticRoutesOnly" } }, @@ -69203,7 +69419,7 @@ "target": "com.amazonaws.ec2#String", "traits": { "aws.protocols#ec2QueryName": "RemoteIpv4NetworkCidr", - "smithy.api#documentation": "

The IPv4 CIDR on the AWS side of the VPN connection.

", + "smithy.api#documentation": "

The IPv4 CIDR on the Amazon Web Services side of the VPN connection.

", "smithy.api#xmlName": "remoteIpv4NetworkCidr" } }, @@ -69219,7 +69435,7 @@ "target": "com.amazonaws.ec2#String", "traits": { "aws.protocols#ec2QueryName": "RemoteIpv6NetworkCidr", - "smithy.api#documentation": "

The IPv6 CIDR on the AWS side of the VPN connection.

", + "smithy.api#documentation": "

The IPv6 CIDR on the Amazon Web Services side of the VPN connection.

", "smithy.api#xmlName": "remoteIpv6NetworkCidr" } }, @@ -69257,7 +69473,7 @@ "target": "com.amazonaws.ec2#Boolean", "traits": { "aws.protocols#ec2QueryName": "StaticRoutesOnly", - "smithy.api#documentation": "

Indicate whether the VPN connection uses static routes only. If you are creating a\n VPN connection for a device that does not support BGP, you must specify\n true. Use CreateVpnConnectionRoute to create a static route.

\n\t\t

Default: false\n

", + "smithy.api#documentation": "

Indicate whether the VPN connection uses static routes only. If you are creating a VPN\n connection for a device that does not support BGP, you must specify true.\n Use CreateVpnConnectionRoute to create a static route.

\n

Default: false\n

", "smithy.api#xmlName": "staticRoutesOnly" } }, @@ -69282,7 +69498,7 @@ "RemoteIpv4NetworkCidr": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The IPv4 CIDR on the AWS side of the VPN connection.

\n

Default: 0.0.0.0/0\n

" + "smithy.api#documentation": "

The IPv4 CIDR on the Amazon Web Services side of the VPN connection.

\n

Default: 0.0.0.0/0\n

" } }, "LocalIpv6NetworkCidr": { @@ -69294,7 +69510,7 @@ "RemoteIpv6NetworkCidr": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The IPv6 CIDR on the AWS side of the VPN connection.

\n

Default: ::/0\n

" + "smithy.api#documentation": "

The IPv6 CIDR on the Amazon Web Services side of the VPN connection.

\n

Default: ::/0\n

" } } }, @@ -69324,7 +69540,7 @@ "target": "com.amazonaws.ec2#String", "traits": { "aws.protocols#ec2QueryName": "AvailabilityZone", - "smithy.api#documentation": "

The Availability Zone where the virtual private gateway was created, if applicable. This field may be empty or not returned.

", + "smithy.api#documentation": "

The Availability Zone where the virtual private gateway was created, if applicable.\n This field may be empty or not returned.

", "smithy.api#xmlName": "availabilityZone" } }, @@ -69364,7 +69580,7 @@ "target": "com.amazonaws.ec2#Long", "traits": { "aws.protocols#ec2QueryName": "AmazonSideAsn", - "smithy.api#documentation": "

The private Autonomous System Number (ASN) for the Amazon side of a BGP session.

", + "smithy.api#documentation": "

The private Autonomous System Number (ASN) for the Amazon side of a BGP\n session.

", "smithy.api#xmlName": "amazonSideAsn" } }, @@ -69494,19 +69710,19 @@ "TunnelInsideCidr": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The range of inside IPv4 addresses for the tunnel. Any specified CIDR blocks must be unique\n\t\t\tacross all VPN connections that use the same virtual private gateway.

\n\t\t

Constraints: A size /30 CIDR block from the 169.254.0.0/16 range. The\n\t\t\tfollowing CIDR blocks are reserved and cannot be used:

\n\t\t " + "smithy.api#documentation": "

The range of inside IPv4 addresses for the tunnel. Any specified CIDR blocks must be\n unique across all VPN connections that use the same virtual private gateway.

\n

Constraints: A size /30 CIDR block from the 169.254.0.0/16 range. The\n following CIDR blocks are reserved and cannot be used:

\n " } }, "TunnelInsideIpv6Cidr": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The range of inside IPv6 addresses for the tunnel. Any specified CIDR blocks must be unique across all VPN connections that use the same transit gateway.

\n

Constraints: A size /126 CIDR block from the local fd00::/8 range.

" + "smithy.api#documentation": "

The range of inside IPv6 addresses for the tunnel. Any specified CIDR blocks must be\n unique across all VPN connections that use the same transit gateway.

\n

Constraints: A size /126 CIDR block from the local fd00::/8 range.

" } }, "PreSharedKey": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The pre-shared key (PSK) to establish initial authentication between the virtual private\n\t\t\tgateway and customer gateway.

\n\t\t

Constraints: Allowed characters are alphanumeric characters, periods (.), and underscores\n (_). Must be between 8 and 64 characters in length and cannot start with zero\n (0).

" + "smithy.api#documentation": "

The pre-shared key (PSK) to establish initial authentication between the virtual\n private gateway and customer gateway.

\n

Constraints: Allowed characters are alphanumeric characters, periods (.), and\n underscores (_). Must be between 8 and 64 characters in length and cannot start with\n zero (0).

" } }, "Phase1LifetimeSeconds": { @@ -69518,19 +69734,19 @@ "Phase2LifetimeSeconds": { "target": "com.amazonaws.ec2#Integer", "traits": { - "smithy.api#documentation": "

The lifetime for phase 2 of the IKE negotiation, in seconds.

\n

Constraints: A value between 900 and 3,600. The value must be less than the value for Phase1LifetimeSeconds.

\n

Default: 3600\n

" + "smithy.api#documentation": "

The lifetime for phase 2 of the IKE negotiation, in seconds.

\n

Constraints: A value between 900 and 3,600. The value must be less than the value for\n Phase1LifetimeSeconds.

\n

Default: 3600\n

" } }, "RekeyMarginTimeSeconds": { "target": "com.amazonaws.ec2#Integer", "traits": { - "smithy.api#documentation": "

The margin time, in seconds, before the phase 2 lifetime expires, during which the AWS side of the VPN connection performs an IKE rekey. The exact time of the rekey is randomly selected based on the value for RekeyFuzzPercentage.

\n

Constraints: A value between 60 and half of Phase2LifetimeSeconds.

\n

Default: 540\n

" + "smithy.api#documentation": "

The margin time, in seconds, before the phase 2 lifetime expires, during which the\n Amazon Web Services side of the VPN connection performs an IKE rekey. The exact time\n of the rekey is randomly selected based on the value for\n RekeyFuzzPercentage.

\n

Constraints: A value between 60 and half of Phase2LifetimeSeconds.

\n

Default: 540\n

" } }, "RekeyFuzzPercentage": { "target": "com.amazonaws.ec2#Integer", "traits": { - "smithy.api#documentation": "

The percentage of the rekey window (determined by RekeyMarginTimeSeconds) during which the rekey time is randomly selected.

\n

Constraints: A value between 0 and 100.

\n

Default: 100\n

" + "smithy.api#documentation": "

The percentage of the rekey window (determined by RekeyMarginTimeSeconds)\n during which the rekey time is randomly selected.

\n

Constraints: A value between 0 and 100.

\n

Default: 100\n

" } }, "ReplayWindowSize": { @@ -69548,48 +69764,48 @@ "DPDTimeoutAction": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The action to take after DPD timeout occurs. Specify restart to restart the IKE initiation. Specify clear to end the IKE session.

\n

Valid Values: clear | none | restart\n

\n

Default: clear\n

" + "smithy.api#documentation": "

The action to take after DPD timeout occurs. Specify restart to restart\n the IKE initiation. Specify clear to end the IKE session.

\n

Valid Values: clear | none | restart\n

\n

Default: clear\n

" } }, "Phase1EncryptionAlgorithms": { "target": "com.amazonaws.ec2#Phase1EncryptionAlgorithmsRequestList", "traits": { - "smithy.api#documentation": "

One or more encryption algorithms that are permitted for the VPN tunnel for phase 1 IKE negotiations.

\n

Valid values: AES128 | AES256 | AES128-GCM-16 | AES256-GCM-16\n

", + "smithy.api#documentation": "

One or more encryption algorithms that are permitted for the VPN tunnel for phase 1\n IKE negotiations.

\n

Valid values: AES128 | AES256 | AES128-GCM-16 |\n AES256-GCM-16\n

", "smithy.api#xmlName": "Phase1EncryptionAlgorithm" } }, "Phase2EncryptionAlgorithms": { "target": "com.amazonaws.ec2#Phase2EncryptionAlgorithmsRequestList", "traits": { - "smithy.api#documentation": "

One or more encryption algorithms that are permitted for the VPN tunnel for phase 2 IKE negotiations.

\n

Valid values: AES128 | AES256 | AES128-GCM-16 | AES256-GCM-16\n

", + "smithy.api#documentation": "

One or more encryption algorithms that are permitted for the VPN tunnel for phase 2\n IKE negotiations.

\n

Valid values: AES128 | AES256 | AES128-GCM-16 |\n AES256-GCM-16\n

", "smithy.api#xmlName": "Phase2EncryptionAlgorithm" } }, "Phase1IntegrityAlgorithms": { "target": "com.amazonaws.ec2#Phase1IntegrityAlgorithmsRequestList", "traits": { - "smithy.api#documentation": "

One or more integrity algorithms that are permitted for the VPN tunnel for phase 1 IKE negotiations.

\n

Valid values: SHA1 | SHA2-256 | SHA2-384 | SHA2-512\n

", + "smithy.api#documentation": "

One or more integrity algorithms that are permitted for the VPN tunnel for phase 1 IKE\n negotiations.

\n

Valid values: SHA1 | SHA2-256 | SHA2-384 |\n SHA2-512\n

", "smithy.api#xmlName": "Phase1IntegrityAlgorithm" } }, "Phase2IntegrityAlgorithms": { "target": "com.amazonaws.ec2#Phase2IntegrityAlgorithmsRequestList", "traits": { - "smithy.api#documentation": "

One or more integrity algorithms that are permitted for the VPN tunnel for phase 2 IKE negotiations.

\n

Valid values: SHA1 | SHA2-256 | SHA2-384 | SHA2-512\n

", + "smithy.api#documentation": "

One or more integrity algorithms that are permitted for the VPN tunnel for phase 2 IKE\n negotiations.

\n

Valid values: SHA1 | SHA2-256 | SHA2-384 |\n SHA2-512\n

", "smithy.api#xmlName": "Phase2IntegrityAlgorithm" } }, "Phase1DHGroupNumbers": { "target": "com.amazonaws.ec2#Phase1DHGroupNumbersRequestList", "traits": { - "smithy.api#documentation": "

One or more Diffie-Hellman group numbers that are permitted for the VPN tunnel for phase 1 IKE negotiations.

\n

Valid values: 2 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24\n

", + "smithy.api#documentation": "

One or more Diffie-Hellman group numbers that are permitted for the VPN tunnel for\n phase 1 IKE negotiations.

\n

Valid values: 2 | 14 | 15 | 16 |\n 17 | 18 | 19 | 20 |\n 21 | 22 | 23 | 24\n

", "smithy.api#xmlName": "Phase1DHGroupNumber" } }, "Phase2DHGroupNumbers": { "target": "com.amazonaws.ec2#Phase2DHGroupNumbersRequestList", "traits": { - "smithy.api#documentation": "

One or more Diffie-Hellman group numbers that are permitted for the VPN tunnel for phase 2 IKE negotiations.

\n

Valid values: 2 | 5 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24\n

", + "smithy.api#documentation": "

One or more Diffie-Hellman group numbers that are permitted for the VPN tunnel for\n phase 2 IKE negotiations.

\n

Valid values: 2 | 5 | 14 | 15 |\n 16 | 17 | 18 | 19 |\n 20 | 21 | 22 | 23 |\n 24\n

", "smithy.api#xmlName": "Phase2DHGroupNumber" } }, @@ -69603,7 +69819,7 @@ "StartupAction": { "target": "com.amazonaws.ec2#String", "traits": { - "smithy.api#documentation": "

The action to take when the establishing the tunnel for the VPN connection. By default, your customer gateway device must initiate the IKE negotiation and bring up the tunnel. Specify start for AWS to initiate the IKE negotiation.

\n

Valid Values: add | start\n

\n

Default: add\n

" + "smithy.api#documentation": "

The action to take when the establishing the tunnel for the VPN connection. By\n default, your customer gateway device must initiate the IKE negotiation and bring up the\n tunnel. Specify start for Amazon Web Services to initiate the IKE\n negotiation.

\n

Valid Values: add | start\n

\n

Default: add\n

" } } }, diff --git a/codegen/sdk-codegen/aws-models/ecr.2015-09-21.json b/codegen/sdk-codegen/aws-models/ecr.2015-09-21.json index 1739ea4dd5e..63d195a3ad9 100644 --- a/codegen/sdk-codegen/aws-models/ecr.2015-09-21.json +++ b/codegen/sdk-codegen/aws-models/ecr.2015-09-21.json @@ -60,6 +60,9 @@ { "target": "com.amazonaws.ecr#DeleteRepositoryPolicy" }, + { + "target": "com.amazonaws.ecr#DescribeImageReplicationStatus" + }, { "target": "com.amazonaws.ecr#DescribeImages" }, @@ -612,6 +615,12 @@ "com.amazonaws.ecr#CreateRepositoryRequest": { "type": "structure", "members": { + "registryId": { + "target": "com.amazonaws.ecr#RegistryId", + "traits": { + "smithy.api#documentation": "

The AWS account ID associated with the registry to create the repository.\n If you do not specify a registry, the default registry is assumed.

" + } + }, "repositoryName": { "target": "com.amazonaws.ecr#RepositoryName", "traits": { @@ -749,6 +758,9 @@ }, { "target": "com.amazonaws.ecr#ServerException" + }, + { + "target": "com.amazonaws.ecr#ValidationException" } ], "traits": { @@ -907,6 +919,79 @@ } } }, + "com.amazonaws.ecr#DescribeImageReplicationStatus": { + "type": "operation", + "input": { + "target": "com.amazonaws.ecr#DescribeImageReplicationStatusRequest" + }, + "output": { + "target": "com.amazonaws.ecr#DescribeImageReplicationStatusResponse" + }, + "errors": [ + { + "target": "com.amazonaws.ecr#ImageNotFoundException" + }, + { + "target": "com.amazonaws.ecr#InvalidParameterException" + }, + { + "target": "com.amazonaws.ecr#RepositoryNotFoundException" + }, + { + "target": "com.amazonaws.ecr#ServerException" + }, + { + "target": "com.amazonaws.ecr#ValidationException" + } + ], + "traits": { + "smithy.api#documentation": "

Returns the replication status for a specified image.

" + } + }, + "com.amazonaws.ecr#DescribeImageReplicationStatusRequest": { + "type": "structure", + "members": { + "repositoryName": { + "target": "com.amazonaws.ecr#RepositoryName", + "traits": { + "smithy.api#documentation": "

The name of the repository that the image is in.

", + "smithy.api#required": {} + } + }, + "imageId": { + "target": "com.amazonaws.ecr#ImageIdentifier", + "traits": { + "smithy.api#required": {} + } + }, + "registryId": { + "target": "com.amazonaws.ecr#RegistryId", + "traits": { + "smithy.api#documentation": "

The Amazon Web Services account ID associated with the registry. If you do not specify a registry, the default registry is assumed.

" + } + } + } + }, + "com.amazonaws.ecr#DescribeImageReplicationStatusResponse": { + "type": "structure", + "members": { + "repositoryName": { + "target": "com.amazonaws.ecr#RepositoryName", + "traits": { + "smithy.api#documentation": "

The repository name associated with the request.

" + } + }, + "imageId": { + "target": "com.amazonaws.ecr#ImageIdentifier" + }, + "replicationStatuses": { + "target": "com.amazonaws.ecr#ImageReplicationStatusList", + "traits": { + "smithy.api#documentation": "

The replication status details for the images in the specified repository.

" + } + } + } + }, "com.amazonaws.ecr#DescribeImageScanFindings": { "type": "operation", "input": { @@ -1744,6 +1829,9 @@ }, { "target": "com.amazonaws.ecr#ServerException" + }, + { + "target": "com.amazonaws.ecr#ValidationException" } ], "traits": { @@ -2087,7 +2175,7 @@ } }, "traits": { - "smithy.api#documentation": "

An object with identifying information for an Amazon ECR image.

" + "smithy.api#documentation": "

An object with identifying information for an image in an Amazon ECR repository.

" } }, "com.amazonaws.ecr#ImageIdentifierList": { @@ -2129,6 +2217,44 @@ "smithy.api#error": "client" } }, + "com.amazonaws.ecr#ImageReplicationStatus": { + "type": "structure", + "members": { + "region": { + "target": "com.amazonaws.ecr#Region", + "traits": { + "smithy.api#documentation": "

The destination Region for the image replication.

" + } + }, + "registryId": { + "target": "com.amazonaws.ecr#RegistryId", + "traits": { + "smithy.api#documentation": "

The AWS account ID associated with the registry to which the image belongs.

" + } + }, + "status": { + "target": "com.amazonaws.ecr#ReplicationStatus", + "traits": { + "smithy.api#documentation": "

The image replication status.

" + } + }, + "failureCode": { + "target": "com.amazonaws.ecr#ReplicationError", + "traits": { + "smithy.api#documentation": "

The failure code for a replication that has failed.

" + } + } + }, + "traits": { + "smithy.api#documentation": "

The status of the replication process for an image.

" + } + }, + "com.amazonaws.ecr#ImageReplicationStatusList": { + "type": "list", + "member": { + "target": "com.amazonaws.ecr#ImageReplicationStatus" + } + }, "com.amazonaws.ecr#ImageScanFinding": { "type": "structure", "members": { @@ -3379,6 +3505,9 @@ }, { "target": "com.amazonaws.ecr#ServerException" + }, + { + "target": "com.amazonaws.ecr#ValidationException" } ], "traits": { @@ -3515,7 +3644,7 @@ "rules": { "target": "com.amazonaws.ecr#ReplicationRuleList", "traits": { - "smithy.api#documentation": "

An array of objects representing the replication rules for a replication\n configuration. A replication configuration may contain only one replication rule but the\n rule may contain one or more replication destinations.

", + "smithy.api#documentation": "

An array of objects representing the replication destinations and repository filters\n for a replication configuration.

", "smithy.api#required": {} } } @@ -3530,20 +3659,20 @@ "region": { "target": "com.amazonaws.ecr#Region", "traits": { - "smithy.api#documentation": "

A Region to replicate to.

", + "smithy.api#documentation": "

The Region to replicate to.

", "smithy.api#required": {} } }, "registryId": { "target": "com.amazonaws.ecr#RegistryId", "traits": { - "smithy.api#documentation": "

The account ID of the destination registry to replicate to.

", + "smithy.api#documentation": "

The Amazon Web Services account ID of the Amazon ECR private registry to replicate to. When configuring\n cross-Region replication within your own registry, specify your own account ID.

", "smithy.api#required": {} } } }, "traits": { - "smithy.api#documentation": "

An array of objects representing the details of a replication destination.

" + "smithy.api#documentation": "

An array of objects representing the destination for a replication rule.

" } }, "com.amazonaws.ecr#ReplicationDestinationList": { @@ -3558,19 +3687,28 @@ } } }, + "com.amazonaws.ecr#ReplicationError": { + "type": "string" + }, "com.amazonaws.ecr#ReplicationRule": { "type": "structure", "members": { "destinations": { "target": "com.amazonaws.ecr#ReplicationDestinationList", "traits": { - "smithy.api#documentation": "

An array of objects representing the details of a replication destination.

", + "smithy.api#documentation": "

An array of objects representing the destination for a replication rule.

", "smithy.api#required": {} } + }, + "repositoryFilters": { + "target": "com.amazonaws.ecr#RepositoryFilterList", + "traits": { + "smithy.api#documentation": "

An array of objects representing the filters for a replication rule. Specifying a\n repository filter for a replication rule provides a method for controlling which\n repositories in a private registry are replicated.

" + } } }, "traits": { - "smithy.api#documentation": "

An array of objects representing the replication destinations for a replication\n configuration. A replication configuration may contain only one replication rule but the\n rule may contain one or more replication destinations.

" + "smithy.api#documentation": "

An array of objects representing the replication destinations and repository filters\n for a replication configuration.

" } }, "com.amazonaws.ecr#ReplicationRuleList": { @@ -3581,10 +3719,29 @@ "traits": { "smithy.api#length": { "min": 0, - "max": 1 + "max": 10 } } }, + "com.amazonaws.ecr#ReplicationStatus": { + "type": "string", + "traits": { + "smithy.api#enum": [ + { + "value": "IN_PROGRESS", + "name": "IN_PROGRESS" + }, + { + "value": "COMPLETE", + "name": "COMPLETE" + }, + { + "value": "FAILED", + "name": "FAILED" + } + ] + } + }, "com.amazonaws.ecr#Repository": { "type": "structure", "members": { @@ -3653,6 +3810,61 @@ "smithy.api#error": "client" } }, + "com.amazonaws.ecr#RepositoryFilter": { + "type": "structure", + "members": { + "filter": { + "target": "com.amazonaws.ecr#RepositoryFilterValue", + "traits": { + "smithy.api#documentation": "

The repository filter details. When the PREFIX_MATCH filter type is\n specified, this value is required and should be the repository name prefix to configure\n replication for.

", + "smithy.api#required": {} + } + }, + "filterType": { + "target": "com.amazonaws.ecr#RepositoryFilterType", + "traits": { + "smithy.api#documentation": "

The repository filter type. The only supported value is PREFIX_MATCH,\n which is a repository name prefix specified with the filter\n parameter.

", + "smithy.api#required": {} + } + } + }, + "traits": { + "smithy.api#documentation": "

The filter settings used with image replication. Specifying a repository filter to a\n replication rule provides a method for controlling which repositories in a private\n registry are replicated. If no repository filter is specified, all images in the\n repository are replicated.

" + } + }, + "com.amazonaws.ecr#RepositoryFilterList": { + "type": "list", + "member": { + "target": "com.amazonaws.ecr#RepositoryFilter" + }, + "traits": { + "smithy.api#length": { + "min": 1, + "max": 100 + } + } + }, + "com.amazonaws.ecr#RepositoryFilterType": { + "type": "string", + "traits": { + "smithy.api#enum": [ + { + "value": "PREFIX_MATCH", + "name": "PREFIX_MATCH" + } + ] + } + }, + "com.amazonaws.ecr#RepositoryFilterValue": { + "type": "string", + "traits": { + "smithy.api#length": { + "min": 2, + "max": 256 + }, + "smithy.api#pattern": "^(?:[a-z0-9]+(?:[._-][a-z0-9]*)*/)*[a-z0-9]*(?:[._-][a-z0-9]*)*$" + } + }, "com.amazonaws.ecr#RepositoryList": { "type": "list", "member": { diff --git a/codegen/sdk-codegen/aws-models/elasticsearchservice.2015-01-01.json b/codegen/sdk-codegen/aws-models/elasticsearchservice.2015-01-01.json index c9dc2e40e4f..e1e574604c2 100644 --- a/codegen/sdk-codegen/aws-models/elasticsearchservice.2015-01-01.json +++ b/codegen/sdk-codegen/aws-models/elasticsearchservice.2015-01-01.json @@ -982,13 +982,13 @@ "Enabled": { "target": "com.amazonaws.elasticsearchservice#Boolean", "traits": { - "smithy.api#documentation": "

True to enable cold storage for an Elasticsearch domain.

", + "smithy.api#documentation": "

Enable cold storage option. Accepted values true or false

", "smithy.api#required": {} } } }, "traits": { - "smithy.api#documentation": "

Specifies settings for cold storage.

" + "smithy.api#documentation": "

Specifies the configuration for cold storage options such as enabled

" } }, "com.amazonaws.elasticsearchservice#CommitMessage": { @@ -2668,6 +2668,12 @@ "traits": { "smithy.api#documentation": "

Specifies the DomainName.

" } + }, + "EngineType": { + "target": "com.amazonaws.elasticsearchservice#EngineType", + "traits": { + "smithy.api#documentation": "

Specifies the EngineType of the domain.

" + } } } }, @@ -2705,7 +2711,7 @@ "min": 3, "max": 28 }, - "smithy.api#pattern": "[a-z][a-z0-9\\-]+" + "smithy.api#pattern": "^[a-z][a-z0-9\\-]+$" } }, "com.amazonaws.elasticsearchservice#DomainNameFqdn": { @@ -3229,7 +3235,7 @@ "ColdStorageOptions": { "target": "com.amazonaws.elasticsearchservice#ColdStorageOptions", "traits": { - "smithy.api#documentation": "

Specifies the ColdStorageOptions configuration for an Elasticsearch domain.

" + "smithy.api#documentation": "

Specifies the ColdStorageOptions config for Elasticsearch Domain

" } } }, @@ -3554,7 +3560,10 @@ } }, "com.amazonaws.elasticsearchservice#ElasticsearchVersionString": { - "type": "string" + "type": "string", + "traits": { + "smithy.api#pattern": "^[0-9]{1}\\.[0-9]{1,2}$|^OpenSearch_[0-9]{1,2}\\.[0-9]{1,2}$" + } }, "com.amazonaws.elasticsearchservice#EncryptionAtRestOptions": { "type": "structure", @@ -3607,6 +3616,21 @@ "target": "com.amazonaws.elasticsearchservice#ServiceUrl" } }, + "com.amazonaws.elasticsearchservice#EngineType": { + "type": "string", + "traits": { + "smithy.api#enum": [ + { + "value": "OpenSearch", + "name": "OpenSearch" + }, + { + "value": "Elasticsearch", + "name": "Elasticsearch" + } + ] + } + }, "com.amazonaws.elasticsearchservice#ErrorDetails": { "type": "structure", "members": { @@ -3653,7 +3677,7 @@ "com.amazonaws.elasticsearchservice#GUID": { "type": "string", "traits": { - "smithy.api#pattern": "\\p{XDigit}{8}-\\p{XDigit}{4}-\\p{XDigit}{4}-\\p{XDigit}{4}-\\p{XDigit}{12}" + "smithy.api#pattern": "^\\p{XDigit}{8}-\\p{XDigit}{4}-\\p{XDigit}{4}-\\p{XDigit}{4}-\\p{XDigit}{12}$" } }, "com.amazonaws.elasticsearchservice#GetCompatibleElasticsearchVersions": { @@ -3975,7 +3999,7 @@ "min": 1, "max": 55 }, - "smithy.api#pattern": "[\\w-]+:[0-9a-f-]+" + "smithy.api#pattern": "^[\\w-]+:[0-9a-f-]+$" } }, "com.amazonaws.elasticsearchservice#InboundCrossClusterSearchConnection": { @@ -4247,6 +4271,9 @@ }, "com.amazonaws.elasticsearchservice#ListDomainNames": { "type": "operation", + "input": { + "target": "com.amazonaws.elasticsearchservice#ListDomainNamesRequest" + }, "output": { "target": "com.amazonaws.elasticsearchservice#ListDomainNamesResponse" }, @@ -4267,18 +4294,33 @@ } } }, + "com.amazonaws.elasticsearchservice#ListDomainNamesRequest": { + "type": "structure", + "members": { + "EngineType": { + "target": "com.amazonaws.elasticsearchservice#EngineType", + "traits": { + "smithy.api#documentation": "

Optional parameter to filter the output by domain engine type. Acceptable values are 'Elasticsearch' and 'OpenSearch'.

", + "smithy.api#httpQuery": "engineType" + } + } + }, + "traits": { + "smithy.api#documentation": "

Container for the parameters to the ListDomainNames operation.

" + } + }, "com.amazonaws.elasticsearchservice#ListDomainNamesResponse": { "type": "structure", "members": { "DomainNames": { "target": "com.amazonaws.elasticsearchservice#DomainInfoList", "traits": { - "smithy.api#documentation": "

List of Elasticsearch domain names.

" + "smithy.api#documentation": "

List of domain names and respective engine types.

" } } }, "traits": { - "smithy.api#documentation": "

The result of a ListDomainNames operation. Contains the names of all Elasticsearch domains owned by this account.

" + "smithy.api#documentation": "

The result of a ListDomainNames operation. Contains the names of all domains owned by this account and their respective engine types.

" } }, "com.amazonaws.elasticsearchservice#ListDomainsForPackage": { @@ -5102,7 +5144,7 @@ "min": 3, "max": 28 }, - "smithy.api#pattern": "[a-z][a-z0-9\\-]+" + "smithy.api#pattern": "^[a-z][a-z0-9\\-]+$" } }, "com.amazonaws.elasticsearchservice#PackageSource": { @@ -6674,7 +6716,7 @@ "min": 1, "max": 55 }, - "smithy.api#pattern": "[\\w-]+_[0-9a-zA-Z]+" + "smithy.api#pattern": "^[\\w-]+_[0-9a-zA-Z]+$" } }, "com.amazonaws.elasticsearchservice#Username": { diff --git a/codegen/sdk-codegen/aws-models/iam.2010-05-08.json b/codegen/sdk-codegen/aws-models/iam.2010-05-08.json index d361b1aad68..e33fce51b89 100644 --- a/codegen/sdk-codegen/aws-models/iam.2010-05-08.json +++ b/codegen/sdk-codegen/aws-models/iam.2010-05-08.json @@ -656,7 +656,7 @@ "Region": { "target": "com.amazonaws.iam#stringType", "traits": { - "smithy.api#documentation": "

The Region where this access key was most recently used. The value for this field is\n \"N/A\" in the following situations:

\n \n

For more information about Regions, see Regions and endpoints in the Amazon Web Services\n General Reference.

", + "smithy.api#documentation": "

The Amazon Web Services Region where this access key was most recently used. The value for this field is\n \"N/A\" in the following situations:

\n \n

For more information about Amazon Web Services Regions, see Regions and endpoints in the Amazon Web Services\n General Reference.

", "smithy.api#required": {} } } @@ -1051,7 +1051,7 @@ } ], "traits": { - "smithy.api#documentation": "

Changes the password of the IAM user who is calling this operation. This operation\n\n can be performed using the CLI, the Amazon Web Services API, or the My\n Security Credentials page in the Management Console. The account root user\n password is not affected by this operation.

\n

Use UpdateLoginProfile to use the CLI, the Amazon Web Services API, or the\n Users page in the IAM console to change the\n password for any IAM user. For more information about modifying passwords, see Managing\n passwords in the IAM User Guide.

" + "smithy.api#documentation": "

Changes the password of the IAM user who is calling this operation. This operation\n\n can be performed using the CLI, the Amazon Web Services API, or the My\n Security Credentials page in the Amazon Web Services Management Console. The Amazon Web Services account root user\n password is not affected by this operation.

\n

Use UpdateLoginProfile to use the CLI, the Amazon Web Services API, or the\n Users page in the IAM console to change the\n password for any IAM user. For more information about modifying passwords, see Managing\n passwords in the IAM User Guide.

" } }, "com.amazonaws.iam#ChangePasswordRequest": { @@ -1067,7 +1067,7 @@ "NewPassword": { "target": "com.amazonaws.iam#passwordType", "traits": { - "smithy.api#documentation": "

The new password. The new password must conform to the account's password\n policy, if one exists.

\n

The regex pattern \n that is used to validate this parameter is a string of characters. That string can include almost any printable \n ASCII character from the space (\\u0020) through the end of the ASCII character range (\\u00FF). \n You can also include the tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D) \n characters. Any of these characters are valid in a password. However, many tools, such \n as the Management Console, might restrict the ability to type certain characters because they have \n special meaning within that tool.

", + "smithy.api#documentation": "

The new password. The new password must conform to the Amazon Web Services account's password\n policy, if one exists.

\n

The regex pattern \n that is used to validate this parameter is a string of characters. That string can include almost any printable \n ASCII character from the space (\\u0020) through the end of the ASCII character range (\\u00FF). \n You can also include the tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D) \n characters. Any of these characters are valid in a password. However, many tools, such \n as the Amazon Web Services Management Console, might restrict the ability to type certain characters because they have \n special meaning within that tool.

", "smithy.api#required": {} } } @@ -1227,7 +1227,7 @@ } ], "traits": { - "smithy.api#documentation": "

Creates a new Amazon Web Services secret access key and corresponding Amazon Web Services access key ID for the\n specified user. The default status for new keys is Active.

\n

If you do not specify a user name, IAM determines the user name implicitly based on\n the Amazon Web Services access key ID signing the request. This operation works for access keys under\n the account. Consequently, you can use this operation to manage account root\n user credentials. This is true even if the account has no associated users.

\n

For information about quotas on the number of keys you can create, see IAM and STS\n quotas in the IAM User Guide.

\n \n

To ensure the security of your account, the secret access key is accessible\n only during key and user creation. You must save the key (for example, in a text\n file) if you want to be able to access it again. If a secret key is lost, you can\n delete the access keys for the associated user and then create new keys.

\n " + "smithy.api#documentation": "

Creates a new Amazon Web Services secret access key and corresponding Amazon Web Services access key ID for the\n specified user. The default status for new keys is Active.

\n

If you do not specify a user name, IAM determines the user name implicitly based on\n the Amazon Web Services access key ID signing the request. This operation works for access keys under\n the Amazon Web Services account. Consequently, you can use this operation to manage Amazon Web Services account root\n user credentials. This is true even if the Amazon Web Services account has no associated users.

\n

For information about quotas on the number of keys you can create, see IAM and STS\n quotas in the IAM User Guide.

\n \n

To ensure the security of your Amazon Web Services account, the secret access key is accessible\n only during key and user creation. You must save the key (for example, in a text\n file) if you want to be able to access it again. If a secret key is lost, you can\n delete the access keys for the associated user and then create new keys.

\n " } }, "com.amazonaws.iam#CreateAccessKeyRequest": { @@ -1273,7 +1273,7 @@ } ], "traits": { - "smithy.api#documentation": "

Creates an alias for your account. For information about using an account\n alias, see Using an\n alias for your account ID in the\n IAM User Guide.

" + "smithy.api#documentation": "

Creates an alias for your Amazon Web Services account. For information about using an Amazon Web Services account\n alias, see Using an\n alias for your Amazon Web Services account ID in the\n IAM User Guide.

" } }, "com.amazonaws.iam#CreateAccountAliasRequest": { @@ -1441,7 +1441,7 @@ } ], "traits": { - "smithy.api#documentation": "

Creates a password for the specified IAM user. A password allows an IAM user to\n access Amazon Web Services services through the Management Console.

\n

You can use the CLI, the Amazon Web Services API, or the Users page in the IAM console to create a password for any IAM user.\n Use ChangePassword to update your own existing password in the\n My Security Credentials page in the\n Management Console.

\n

For more information about managing passwords, see Managing passwords in the\n IAM User Guide.

" + "smithy.api#documentation": "

Creates a password for the specified IAM user. A password allows an IAM user to\n access Amazon Web Services services through the Amazon Web Services Management Console.

\n

You can use the CLI, the Amazon Web Services API, or the Users page in the IAM console to create a password for any IAM user.\n Use ChangePassword to update your own existing password in the\n My Security Credentials page in the\n Amazon Web Services Management Console.

\n

For more information about managing passwords, see Managing passwords in the\n IAM User Guide.

" } }, "com.amazonaws.iam#CreateLoginProfileRequest": { @@ -1457,7 +1457,7 @@ "Password": { "target": "com.amazonaws.iam#passwordType", "traits": { - "smithy.api#documentation": "

The new password for the user.

\n

The regex pattern \n that is used to validate this parameter is a string of characters. That string can include almost any printable \n ASCII character from the space (\\u0020) through the end of the ASCII character range (\\u00FF). \n You can also include the tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D) \n characters. Any of these characters are valid in a password. However, many tools, such \n as the Management Console, might restrict the ability to type certain characters because they have \n special meaning within that tool.

", + "smithy.api#documentation": "

The new password for the user.

\n

The regex pattern \n that is used to validate this parameter is a string of characters. That string can include almost any printable \n ASCII character from the space (\\u0020) through the end of the ASCII character range (\\u00FF). \n You can also include the tab (\\u0009), line feed (\\u000A), and carriage return (\\u000D) \n characters. Any of these characters are valid in a password. However, many tools, such \n as the Amazon Web Services Management Console, might restrict the ability to type certain characters because they have \n special meaning within that tool.

", "smithy.api#required": {} } }, @@ -1510,7 +1510,7 @@ } ], "traits": { - "smithy.api#documentation": "

Creates an IAM entity to describe an identity provider (IdP) that supports OpenID Connect (OIDC).

\n

The OIDC provider that you create with this operation can be used as a principal in a\n role's trust policy. Such a policy establishes a trust relationship between Amazon Web Services and\n the OIDC provider.

\n

If you are using an OIDC identity provider from Google, Facebook, or Amazon Cognito, you don't\n need to create a separate IAM identity provider. These OIDC identity providers are\n already built-in to Amazon Web Services and are available for your use. Instead, you can move directly\n to creating new roles using your identity provider. To learn more, see Creating\n a role for web identity or OpenID connect federation in the IAM\n User Guide.

\n

When you create the IAM OIDC provider, you specify the following:

\n \n

You get all of this information from the OIDC IdP that you want to use to access\n Amazon Web Services.

\n \n

Amazon Web Services secures communication with some OIDC identity providers (IdPs) through our\n library of trusted certificate authorities (CAs) instead of using a certificate\n thumbprint to verify your IdP server certificate. These OIDC IdPs include Google, and\n those that use an Amazon S3 bucket to host a JSON Web Key Set (JWKS) endpoint. In these\n cases, your legacy thumbprint remains in your configuration, but is no longer used for validation.

\n \n \n

The trust for the OIDC provider is derived from the IAM provider that this\n operation creates. Therefore, it is best to limit access to the CreateOpenIDConnectProvider operation to highly privileged\n users.

\n " + "smithy.api#documentation": "

Creates an IAM entity to describe an identity provider (IdP) that supports OpenID Connect (OIDC).

\n

The OIDC provider that you create with this operation can be used as a principal in a\n role's trust policy. Such a policy establishes a trust relationship between Amazon Web Services and\n the OIDC provider.

\n

If you are using an OIDC identity provider from Google, Facebook, or Amazon Cognito, you don't\n need to create a separate IAM identity provider. These OIDC identity providers are\n already built-in to Amazon Web Services and are available for your use. Instead, you can move directly\n to creating new roles using your identity provider. To learn more, see Creating\n a role for web identity or OpenID connect federation in the IAM\n User Guide.

\n

When you create the IAM OIDC provider, you specify the following:

\n \n

You get all of this information from the OIDC IdP you want to use to access\n Amazon Web Services.

\n \n

Amazon Web Services secures communication with some OIDC identity providers (IdPs) through our\n library of trusted certificate authorities (CAs) instead of using a certificate\n thumbprint to verify your IdP server certificate. These OIDC IdPs include Google, and\n those that use an Amazon S3 bucket to host a JSON Web Key Set (JWKS) endpoint. In these\n cases, your legacy thumbprint remains in your configuration, but is no longer used for validation.

\n \n \n

The trust for the OIDC provider is derived from the IAM provider that this\n operation creates. Therefore, it is best to limit access to the CreateOpenIDConnectProvider operation to highly privileged\n users.

\n " } }, "com.amazonaws.iam#CreateOpenIDConnectProviderRequest": { @@ -1519,20 +1519,20 @@ "Url": { "target": "com.amazonaws.iam#OpenIDConnectProviderUrlType", "traits": { - "smithy.api#documentation": "

The URL of the identity provider. The URL must begin with https:// and\n should correspond to the iss claim in the provider's OpenID Connect ID\n tokens. Per the OIDC standard, path components are allowed but query parameters are not.\n Typically the URL consists of only a hostname, like\n https://server.example.org or https://example.com.

\n

You cannot register the same provider multiple times in a single account. If you\n try to submit a URL that has already been used for an OpenID Connect provider in the\n account, you will get an error.

", + "smithy.api#documentation": "

The URL of the identity provider. The URL must begin with https:// and\n should correspond to the iss claim in the provider's OpenID Connect ID\n tokens. Per the OIDC standard, path components are allowed but query parameters are not.\n Typically the URL consists of only a hostname, like\n https://server.example.org or https://example.com. The URL\n should not contain a port number.

\n

You cannot register the same provider multiple times in a single Amazon Web Services account. If you\n try to submit a URL that has already been used for an OpenID Connect provider in the\n Amazon Web Services account, you will get an error.

", "smithy.api#required": {} } }, "ClientIDList": { "target": "com.amazonaws.iam#clientIDListType", "traits": { - "smithy.api#documentation": "

A list of client IDs (also known as audiences). When a mobile or web app registers\n with an OpenID Connect provider, they establish a value that identifies the application.\n (This is the value that's sent as the client_id parameter on OAuth\n requests.)

\n

You can register multiple client IDs with the same provider. For example, you might\n have multiple applications that use the same OIDC provider. You cannot register more\n than 100 client IDs with a single IAM OIDC provider.

\n

There is no defined format for a client ID. The\n CreateOpenIDConnectProviderRequest operation accepts client IDs up to\n 255 characters long.

" + "smithy.api#documentation": "

Provides a list of client IDs, also known as audiences. When a mobile or web app registers\n with an OpenID Connect provider, they establish a value that identifies the application.\n This is the value that's sent as the client_id parameter on OAuth\n requests.

\n

You can register multiple client IDs with the same provider. For example, you might\n have multiple applications that use the same OIDC provider. You cannot register more\n than 100 client IDs with a single IAM OIDC provider.

\n

There is no defined format for a client ID. The\n CreateOpenIDConnectProviderRequest operation accepts client IDs up to\n 255 characters long.

" } }, "ThumbprintList": { "target": "com.amazonaws.iam#thumbprintListType", "traits": { - "smithy.api#documentation": "

A list of server certificate thumbprints for the OpenID Connect (OIDC) identity\n provider's server certificates. Typically this list includes only one entry. However,\n IAM lets you have up to five thumbprints for an OIDC provider. This lets you maintain\n multiple thumbprints if the identity provider is rotating certificates.

\n

The server certificate thumbprint is the hex-encoded SHA-1 hash value of the X.509\n certificate used by the domain where the OpenID Connect provider makes its keys\n available. It is always a 40-character string.

\n

You must provide at least one thumbprint when creating an IAM OIDC provider. For\n example, assume that the OIDC provider is server.example.com and the\n provider stores its keys at https://keys.server.example.com/openid-connect. In that\n case, the thumbprint string would be the hex-encoded SHA-1 hash value of the certificate\n used by https://keys.server.example.com.

\n

For more information about obtaining the OIDC provider's thumbprint, see Obtaining the\n thumbprint for an OpenID Connect provider in the IAM User\n Guide.

", + "smithy.api#documentation": "

A list of server certificate thumbprints for the OpenID Connect (OIDC) identity\n provider's server certificates. Typically this list includes only one entry. However,\n IAM lets you have up to five thumbprints for an OIDC provider. This lets you maintain\n multiple thumbprints if the identity provider is rotating certificates.

\n

The server certificate thumbprint is the hex-encoded SHA-1 hash value of the X.509\n certificate used by the domain where the OpenID Connect provider makes its keys\n available. It is always a 40-character string.

\n

You must provide at least one thumbprint when creating an IAM OIDC provider. For\n example, assume that the OIDC provider is server.example.com and the\n provider stores its keys at https://keys.server.example.com/openid-connect. In that\n case, the thumbprint string would be the hex-encoded SHA-1 hash value of the certificate\n used by https://keys.server.example.com.\n

\n

For more information about obtaining the OIDC provider thumbprint, see Obtaining the\n thumbprint for an OpenID Connect provider in the IAM User\n Guide.

", "smithy.api#required": {} } }, @@ -1593,7 +1593,7 @@ } ], "traits": { - "smithy.api#documentation": "

Creates a new managed policy for your account.

\n

This operation creates a policy version with a version identifier of v1\n and sets v1 as the policy's default version. For more information about policy versions,\n see Versioning for managed policies in the\n IAM User Guide.

\n

As a best practice, you can validate your IAM policies. \n To learn more, see Validating IAM policies \n in the IAM User Guide.

\n

For more information about managed policies in general, see Managed\n policies and inline policies in the\n IAM User Guide.

" + "smithy.api#documentation": "

Creates a new managed policy for your Amazon Web Services account.

\n

This operation creates a policy version with a version identifier of v1\n and sets v1 as the policy's default version. For more information about policy versions,\n see Versioning for managed policies in the\n IAM User Guide.

\n

As a best practice, you can validate your IAM policies. \n To learn more, see Validating IAM policies \n in the IAM User Guide.

\n

For more information about managed policies in general, see Managed\n policies and inline policies in the\n IAM User Guide.

" } }, "com.amazonaws.iam#CreatePolicyRequest": { @@ -1609,7 +1609,7 @@ "Path": { "target": "com.amazonaws.iam#policyPathType", "traits": { - "smithy.api#documentation": "

The path for the policy.

\n

For more information about paths, see IAM identifiers in the\n IAM User Guide.

\n

This parameter is optional. If it is not included, it defaults to a slash (/).

\n

This parameter allows (through its regex pattern) a string of characters consisting \n of either a forward slash (/) by itself or a string that must begin and end with forward slashes.\n In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including \n most punctuation characters, digits, and upper and lowercased letters.

" + "smithy.api#documentation": "

The path for the policy.

\n

For more information about paths, see IAM identifiers in the\n IAM User Guide.

\n

This parameter is optional. If it is not included, it defaults to a slash (/).

\n

This parameter allows (through its regex pattern) a string of characters consisting \n of either a forward slash (/) by itself or a string that must begin and end with forward slashes.\n In addition, it can contain any ASCII character from the ! (\\u0021) through the DEL character (\\u007F), including \n most punctuation characters, digits, and upper and lowercased letters.

\n \n

You cannot use an asterisk (*) in the path name.

\n " } }, "PolicyDocument": { @@ -1744,7 +1744,7 @@ } ], "traits": { - "smithy.api#documentation": "

Creates a new role for your account. For more information about roles, see\n IAM\n roles. For information about quotas for role names and the number of roles\n you can create, see IAM and STS quotas in the\n IAM User Guide.

" + "smithy.api#documentation": "

Creates a new role for your Amazon Web Services account. For more information about roles, see\n IAM\n roles. For information about quotas for role names and the number of roles\n you can create, see IAM and STS quotas in the\n IAM User Guide.

" } }, "com.amazonaws.iam#CreateRoleRequest": { @@ -1837,7 +1837,7 @@ } ], "traits": { - "smithy.api#documentation": "

Creates an IAM resource that describes an identity provider (IdP) that supports SAML\n 2.0.

\n

The SAML provider resource that you create with this operation can be used as a\n principal in an IAM role's trust policy. Such a policy can enable federated users who\n sign in using the SAML IdP to assume the role. You can create an IAM role that\n supports Web-based single sign-on (SSO) to the Management Console or one that supports API access\n to Amazon Web Services.

\n

When you create the SAML provider resource, you upload a SAML metadata document that\n you get from your IdP. That document includes the issuer's name, expiration information,\n and keys that can be used to validate the SAML authentication response (assertions) that\n the IdP sends. You must generate the metadata document using the identity management\n software that is used as your organization's IdP.

\n \n

This operation requires Signature Version 4.

\n \n

For more information, see Enabling SAML 2.0\n federated users to access the Management Console and About SAML 2.0-based\n federation in the IAM User Guide.

" + "smithy.api#documentation": "

Creates an IAM resource that describes an identity provider (IdP) that supports SAML\n 2.0.

\n

The SAML provider resource that you create with this operation can be used as a\n principal in an IAM role's trust policy. Such a policy can enable federated users who\n sign in using the SAML IdP to assume the role. You can create an IAM role that\n supports Web-based single sign-on (SSO) to the Amazon Web Services Management Console or one that supports API access\n to Amazon Web Services.

\n

When you create the SAML provider resource, you upload a SAML metadata document that\n you get from your IdP. That document includes the issuer's name, expiration information,\n and keys that can be used to validate the SAML authentication response (assertions) that\n the IdP sends. You must generate the metadata document using the identity management\n software that is used as your organization's IdP.

\n \n

This operation requires Signature Version 4.

\n \n

For more information, see Enabling SAML 2.0\n federated users to access the Amazon Web Services Management Console and About SAML 2.0-based\n federation in the IAM User Guide.

" } }, "com.amazonaws.iam#CreateSAMLProviderRequest": { @@ -2028,7 +2028,7 @@ } ], "traits": { - "smithy.api#documentation": "

Creates a new IAM user for your account.

\n

For information about quotas for the number of IAM users you can create, see IAM and STS\n quotas in the IAM User Guide.

" + "smithy.api#documentation": "

Creates a new IAM user for your Amazon Web Services account.

\n

For information about quotas for the number of IAM users you can create, see IAM and STS\n quotas in the IAM User Guide.

" } }, "com.amazonaws.iam#CreateUserRequest": { @@ -2101,7 +2101,7 @@ } ], "traits": { - "smithy.api#documentation": "

Creates a new virtual MFA device for the account. After creating the virtual\n MFA, use EnableMFADevice to attach the MFA device to an IAM user.\n For more information about creating and working with virtual MFA devices, see Using a virtual MFA\n device in the IAM User Guide.

\n

For information about the maximum number of MFA devices you can create, see IAM and STS\n quotas in the IAM User Guide.

\n \n

The seed information contained in the QR code and the Base32 string should be\n treated like any other secret access information. In other words, protect the seed\n information as you would your Amazon Web Services access keys or your passwords. After you\n provision your virtual device, you should ensure that the information is destroyed\n following secure procedures.

\n " + "smithy.api#documentation": "

Creates a new virtual MFA device for the Amazon Web Services account. After creating the virtual\n MFA, use EnableMFADevice to attach the MFA device to an IAM user.\n For more information about creating and working with virtual MFA devices, see Using a virtual MFA\n device in the IAM User Guide.

\n

For information about the maximum number of MFA devices you can create, see IAM and STS\n quotas in the IAM User Guide.

\n \n

The seed information contained in the QR code and the Base32 string should be\n treated like any other secret access information. In other words, protect the seed\n information as you would your Amazon Web Services access keys or your passwords. After you\n provision your virtual device, you should ensure that the information is destroyed\n following secure procedures.

\n " } }, "com.amazonaws.iam#CreateVirtualMFADeviceRequest": { @@ -2253,7 +2253,7 @@ } ], "traits": { - "smithy.api#documentation": "

Deletes the access key pair associated with the specified IAM user.

\n

If you do not specify a user name, IAM determines the user name implicitly based on\n the Amazon Web Services access key ID signing the request. This operation works for access keys under\n the account. Consequently, you can use this operation to manage account root\n user credentials even if the account has no associated users.

" + "smithy.api#documentation": "

Deletes the access key pair associated with the specified IAM user.

\n

If you do not specify a user name, IAM determines the user name implicitly based on\n the Amazon Web Services access key ID signing the request. This operation works for access keys under\n the Amazon Web Services account. Consequently, you can use this operation to manage Amazon Web Services account root\n user credentials even if the Amazon Web Services account has no associated users.

" } }, "com.amazonaws.iam#DeleteAccessKeyRequest": { @@ -2291,7 +2291,7 @@ } ], "traits": { - "smithy.api#documentation": "

Deletes the specified account alias. For information about using an Amazon Web Services\n account alias, see Using an alias for your account ID in the\n IAM User Guide.

" + "smithy.api#documentation": "

Deletes the specified Amazon Web Services account alias. For information about using an Amazon Web Services\n account alias, see Using an alias for your Amazon Web Services account ID in the\n IAM User Guide.

" } }, "com.amazonaws.iam#DeleteAccountAliasRequest": { @@ -2320,7 +2320,7 @@ } ], "traits": { - "smithy.api#documentation": "

Deletes the password policy for the account. There are no parameters.

" + "smithy.api#documentation": "

Deletes the password policy for the Amazon Web Services account. There are no parameters.

" } }, "com.amazonaws.iam#DeleteConflictException": { @@ -2469,7 +2469,7 @@ } ], "traits": { - "smithy.api#documentation": "

Deletes the password for the specified IAM user, which terminates the user's ability\n to access Amazon Web Services services through the Management Console.

\n

You can use the CLI, the Amazon Web Services API, or the Users page in the IAM console to delete a password for any IAM user.\n You can use ChangePassword to update, but not delete, your own\n password in the My Security Credentials page in the\n Management Console.

\n \n

Deleting a user's password does not prevent a user from accessing Amazon Web Services through\n the command line interface or the API. To prevent all user access, you must also\n either make any access keys inactive or delete them. For more information about\n making keys inactive or deleting them, see UpdateAccessKey and\n DeleteAccessKey.

\n " + "smithy.api#documentation": "

Deletes the password for the specified IAM user, which terminates the user's ability\n to access Amazon Web Services services through the Amazon Web Services Management Console.

\n

You can use the CLI, the Amazon Web Services API, or the Users page in the IAM console to delete a password for any IAM user.\n You can use ChangePassword to update, but not delete, your own\n password in the My Security Credentials page in the\n Amazon Web Services Management Console.

\n \n

Deleting a user's password does not prevent a user from accessing Amazon Web Services through\n the command line interface or the API. To prevent all user access, you must also\n either make any access keys inactive or delete them. For more information about\n making keys inactive or deleting them, see UpdateAccessKey and\n DeleteAccessKey.

\n " } }, "com.amazonaws.iam#DeleteLoginProfileRequest": { @@ -2913,7 +2913,7 @@ } ], "traits": { - "smithy.api#documentation": "

Deletes a signing certificate associated with the specified IAM user.

\n

If you do not specify a user name, IAM determines the user name implicitly based on\n the Amazon Web Services access key ID signing the request. This operation works for access keys under\n the account. Consequently, you can use this operation to manage account root\n user credentials even if the account has no associated IAM users.

" + "smithy.api#documentation": "

Deletes a signing certificate associated with the specified IAM user.

\n

If you do not specify a user name, IAM determines the user name implicitly based on\n the Amazon Web Services access key ID signing the request. This operation works for access keys under\n the Amazon Web Services account. Consequently, you can use this operation to manage Amazon Web Services account root\n user credentials even if the Amazon Web Services account has no associated IAM users.

" } }, "com.amazonaws.iam#DeleteSigningCertificateRequest": { @@ -2957,7 +2957,7 @@ } ], "traits": { - "smithy.api#documentation": "

Deletes the specified IAM user. Unlike the Management Console, when you delete a user\n programmatically, you must delete the items attached to the user manually, or the\n deletion fails. For more information, see Deleting an IAM\n user. Before attempting to delete a user, remove the following items:

\n " + "smithy.api#documentation": "

Deletes the specified IAM user. Unlike the Amazon Web Services Management Console, when you delete a user\n programmatically, you must delete the items attached to the user manually, or the\n deletion fails. For more information, see Deleting an IAM\n user. Before attempting to delete a user, remove the following items:

\n " } }, "com.amazonaws.iam#DeleteUserPermissionsBoundary": { @@ -3599,7 +3599,7 @@ } ], "traits": { - "smithy.api#documentation": "

Generates a credential report for the account. For more information about the\n credential report, see Getting credential reports in\n the IAM User Guide.

" + "smithy.api#documentation": "

Generates a credential report for the Amazon Web Services account. For more information about the\n credential report, see Getting credential reports in\n the IAM User Guide.

" } }, "com.amazonaws.iam#GenerateCredentialReportResponse": { @@ -3636,7 +3636,7 @@ } ], "traits": { - "smithy.api#documentation": "

Generates a report for service last accessed data for Organizations. You can generate a\n report for any entities (organization root, organizational unit, or account) or policies\n in your organization.

\n

To call this operation, you must be signed in using your Organizations management account\n credentials. You can use your long-term IAM user or root user credentials, or\n temporary credentials from assuming an IAM role. SCPs must be enabled for your\n organization root. You must have the required IAM and Organizations permissions. For more\n information, see Refining permissions using\n service last accessed data in the\n IAM User Guide.

\n

You can generate a service last accessed data report for entities by specifying only\n the entity's path. This data includes a list of services that are allowed by any service\n control policies (SCPs) that apply to the entity.

\n

You can generate a service last accessed data report for a policy by specifying an\n entity's path and an optional Organizations policy ID. This data includes a list of services that\n are allowed by the specified SCP.

\n

For each service in both report types, the data includes the most recent account\n activity that the policy allows to account principals in the entity or the entity's\n children. For important information about the data, reporting period, permissions\n required, troubleshooting, and supported Regions see Reducing permissions using\n service last accessed data in the\n IAM User Guide.

\n \n

The data includes all attempts to access Amazon Web Services, not just the successful ones. This\n includes all attempts that were made using the Management Console, the Amazon Web Services API through any\n of the SDKs, or any of the command line tools. An unexpected entry in the service\n last accessed data does not mean that an account has been compromised, because the\n request might have been denied. Refer to your CloudTrail logs as the authoritative\n source for information about all API calls and whether they were successful or\n denied access. For more information, see Logging IAM events with\n CloudTrail in the IAM User Guide.

\n \n

This operation returns a JobId. Use this parameter in the \n GetOrganizationsAccessReport\n operation to check the status of\n the report generation. To check the status of this request, use the JobId\n parameter in the \n GetOrganizationsAccessReport\n operation\n and test the JobStatus response parameter. When the job is complete, you\n can retrieve the report.

\n

To generate a service last accessed data report for entities, specify an entity path\n without specifying the optional Organizations policy ID. The type of entity that you specify\n determines the data returned in the report.

\n \n

To generate a service last accessed data report for policies, specify an entity path\n and the optional Organizations policy ID. The type of entity that you specify determines the data\n returned for each service.

\n \n \n

Service last accessed data does not use other policy types when determining\n whether a principal could access a service. These other policy types include\n identity-based policies, resource-based policies, access control lists, IAM\n permissions boundaries, and STS assume role policies. It only applies SCP logic.\n For more about the evaluation of policy types, see Evaluating policies in the\n IAM User Guide.

\n \n

For more information about service last accessed data, see Reducing policy scope by\n viewing user activity in the IAM User Guide.

" + "smithy.api#documentation": "

Generates a report for service last accessed data for Organizations. You can generate a\n report for any entities (organization root, organizational unit, or account) or policies\n in your organization.

\n

To call this operation, you must be signed in using your Organizations management account\n credentials. You can use your long-term IAM user or root user credentials, or\n temporary credentials from assuming an IAM role. SCPs must be enabled for your\n organization root. You must have the required IAM and Organizations permissions. For more\n information, see Refining permissions using\n service last accessed data in the\n IAM User Guide.

\n

You can generate a service last accessed data report for entities by specifying only\n the entity's path. This data includes a list of services that are allowed by any service\n control policies (SCPs) that apply to the entity.

\n

You can generate a service last accessed data report for a policy by specifying an\n entity's path and an optional Organizations policy ID. This data includes a list of services that\n are allowed by the specified SCP.

\n

For each service in both report types, the data includes the most recent account\n activity that the policy allows to account principals in the entity or the entity's\n children. For important information about the data, reporting period, permissions\n required, troubleshooting, and supported Regions see Reducing permissions using\n service last accessed data in the\n IAM User Guide.

\n \n

The data includes all attempts to access Amazon Web Services, not just the successful ones. This\n includes all attempts that were made using the Amazon Web Services Management Console, the Amazon Web Services API through any\n of the SDKs, or any of the command line tools. An unexpected entry in the service\n last accessed data does not mean that an account has been compromised, because the\n request might have been denied. Refer to your CloudTrail logs as the authoritative\n source for information about all API calls and whether they were successful or\n denied access. For more information, see Logging IAM events with\n CloudTrail in the IAM User Guide.

\n \n

This operation returns a JobId. Use this parameter in the \n GetOrganizationsAccessReport\n operation to check the status of\n the report generation. To check the status of this request, use the JobId\n parameter in the \n GetOrganizationsAccessReport\n operation\n and test the JobStatus response parameter. When the job is complete, you\n can retrieve the report.

\n

To generate a service last accessed data report for entities, specify an entity path\n without specifying the optional Organizations policy ID. The type of entity that you specify\n determines the data returned in the report.

\n \n

To generate a service last accessed data report for policies, specify an entity path\n and the optional Organizations policy ID. The type of entity that you specify determines the data\n returned for each service.

\n \n \n

Service last accessed data does not use other policy types when determining\n whether a principal could access a service. These other policy types include\n identity-based policies, resource-based policies, access control lists, IAM\n permissions boundaries, and STS assume role policies. It only applies SCP logic.\n For more about the evaluation of policy types, see Evaluating policies in the\n IAM User Guide.

\n \n

For more information about service last accessed data, see Reducing policy scope by\n viewing user activity in the IAM User Guide.

" } }, "com.amazonaws.iam#GenerateOrganizationsAccessReportRequest": { @@ -3685,7 +3685,7 @@ } ], "traits": { - "smithy.api#documentation": "

Generates a report that includes details about when an IAM resource (user, group,\n role, or policy) was last used in an attempt to access Amazon Web Services services. Recent activity\n usually appears within four hours. IAM reports activity for the last 365 days, or less\n if your Region began supporting this feature within the last year. For more information,\n see Regions where data is tracked.

\n \n

The service last accessed data includes all attempts to access an Amazon Web Services API, not\n just the successful ones. This includes all attempts that were made using the\n Management Console, the Amazon Web Services API through any of the SDKs, or any of the command line tools.\n An unexpected entry in the service last accessed data does not mean that your\n account has been compromised, because the request might have been denied. Refer to\n your CloudTrail logs as the authoritative source for information about all API calls\n and whether they were successful or denied access. For more information, see Logging\n IAM events with CloudTrail in the\n IAM User Guide.

\n \n

The GenerateServiceLastAccessedDetails operation returns a\n JobId. Use this parameter in the following operations to retrieve the\n following details from your report:

\n \n

To check the status of the GenerateServiceLastAccessedDetails request,\n use the JobId parameter in the same operations and test the\n JobStatus response parameter.

\n

For additional information about the permissions policies that allow an identity\n (user, group, or role) to access specific services, use the ListPoliciesGrantingServiceAccess operation.

\n \n

Service last accessed data does not use other policy types when determining\n whether a resource could access a service. These other policy types include\n resource-based policies, access control lists, Organizations policies, IAM\n permissions boundaries, and STS assume role policies. It only applies\n permissions policy logic. For more about the evaluation of policy types, see Evaluating policies in the\n IAM User Guide.

\n \n

For more information about service and action last accessed data, see Reducing permissions using service last accessed data in the\n IAM User Guide.

" + "smithy.api#documentation": "

Generates a report that includes details about when an IAM resource (user, group,\n role, or policy) was last used in an attempt to access Amazon Web Services services. Recent activity\n usually appears within four hours. IAM reports activity for the last 365 days, or less\n if your Region began supporting this feature within the last year. For more information,\n see Regions where data is tracked.

\n \n

The service last accessed data includes all attempts to access an Amazon Web Services API, not\n just the successful ones. This includes all attempts that were made using the\n Amazon Web Services Management Console, the Amazon Web Services API through any of the SDKs, or any of the command line tools.\n An unexpected entry in the service last accessed data does not mean that your\n account has been compromised, because the request might have been denied. Refer to\n your CloudTrail logs as the authoritative source for information about all API calls\n and whether they were successful or denied access. For more information, see Logging\n IAM events with CloudTrail in the\n IAM User Guide.

\n \n

The GenerateServiceLastAccessedDetails operation returns a\n JobId. Use this parameter in the following operations to retrieve the\n following details from your report:

\n \n

To check the status of the GenerateServiceLastAccessedDetails request,\n use the JobId parameter in the same operations and test the\n JobStatus response parameter.

\n

For additional information about the permissions policies that allow an identity\n (user, group, or role) to access specific services, use the ListPoliciesGrantingServiceAccess operation.

\n \n

Service last accessed data does not use other policy types when determining\n whether a resource could access a service. These other policy types include\n resource-based policies, access control lists, Organizations policies, IAM\n permissions boundaries, and STS assume role policies. It only applies\n permissions policy logic. For more about the evaluation of policy types, see Evaluating policies in the\n IAM User Guide.

\n \n

For more information about service and action last accessed data, see Reducing permissions using service last accessed data in the\n IAM User Guide.

" } }, "com.amazonaws.iam#GenerateServiceLastAccessedDetailsRequest": { @@ -3869,7 +3869,7 @@ } ], "traits": { - "smithy.api#documentation": "

Retrieves the password policy for the account. This tells you the complexity\n requirements and mandatory rotation periods for the IAM user passwords in your account.\n For more information about using a password policy, see Managing an IAM password\n policy.

" + "smithy.api#documentation": "

Retrieves the password policy for the Amazon Web Services account. This tells you the complexity\n requirements and mandatory rotation periods for the IAM user passwords in your account.\n For more information about using a password policy, see Managing an IAM password\n policy.

" } }, "com.amazonaws.iam#GetAccountPasswordPolicyResponse": { @@ -4016,7 +4016,7 @@ } ], "traits": { - "smithy.api#documentation": "

Retrieves a credential report for the account. For more information about the\n credential report, see Getting credential reports in\n the IAM User Guide.

" + "smithy.api#documentation": "

Retrieves a credential report for the Amazon Web Services account. For more information about the\n credential report, see Getting credential reports in\n the IAM User Guide.

" } }, "com.amazonaws.iam#GetCredentialReportResponse": { @@ -4280,7 +4280,7 @@ } ], "traits": { - "smithy.api#documentation": "

Retrieves the user name for the specified IAM user. A login profile is created when\n you create a password for the user to access the Management Console. If the user does not exist\n or does not have a password, the operation returns a 404 (NoSuchEntity)\n error.

\n

If you create an IAM user with access to the console, the CreateDate\n reflects the date you created the initial password for the user.

\n

If you create an IAM user with programmatic access, and then later add a password\n for the user to access the Management Console, the CreateDate reflects the initial\n password creation date. A user with programmatic access does not have a login profile\n unless you create a password for the user to access the Management Console.

" + "smithy.api#documentation": "

Retrieves the user name for the specified IAM user. A login profile is created when\n you create a password for the user to access the Amazon Web Services Management Console. If the user does not exist\n or does not have a password, the operation returns a 404 (NoSuchEntity)\n error.

\n

If you create an IAM user with access to the console, the CreateDate\n reflects the date you created the initial password for the user.

\n

If you create an IAM user with programmatic access, and then later add a password\n for the user to access the Amazon Web Services Management Console, the CreateDate reflects the initial\n password creation date. A user with programmatic access does not have a login profile\n unless you create a password for the user to access the Amazon Web Services Management Console.

" } }, "com.amazonaws.iam#GetLoginProfileRequest": { @@ -4369,7 +4369,7 @@ "CreateDate": { "target": "com.amazonaws.iam#dateType", "traits": { - "smithy.api#documentation": "

The date and time when the IAM OIDC provider resource object was created in the\n account.

" + "smithy.api#documentation": "

The date and time when the IAM OIDC provider resource object was created in the\n Amazon Web Services account.

" } }, "Tags": { @@ -5603,7 +5603,7 @@ } ], "traits": { - "smithy.api#documentation": "

Returns information about the access key IDs associated with the specified IAM user.\n If there is none, the operation returns an empty list.

\n

Although each user is limited to a small number of keys, you can still paginate the\n results using the MaxItems and Marker parameters.

\n

If the UserName field is not specified, the user name is determined\n implicitly based on the Amazon Web Services access key ID used to sign the request. This operation\n works for access keys under the account. Consequently, you can use this operation\n to manage account root user credentials even if the account has no\n associated users.

\n \n

To ensure the security of your account, the secret access key is accessible\n only during key and user creation.

\n ", + "smithy.api#documentation": "

Returns information about the access key IDs associated with the specified IAM user.\n If there is none, the operation returns an empty list.

\n

Although each user is limited to a small number of keys, you can still paginate the\n results using the MaxItems and Marker parameters.

\n

If the UserName field is not specified, the user name is determined\n implicitly based on the Amazon Web Services access key ID used to sign the request. This operation\n works for access keys under the Amazon Web Services account. Consequently, you can use this operation\n to manage Amazon Web Services account root user credentials even if the Amazon Web Services account has no\n associated users.

\n \n

To ensure the security of your Amazon Web Services account, the secret access key is accessible\n only during key and user creation.

\n ", "smithy.api#paginated": { "inputToken": "Marker", "outputToken": "Marker", @@ -5676,7 +5676,7 @@ } ], "traits": { - "smithy.api#documentation": "

Lists the account alias associated with the account (Note: you can have only\n one). For information about using an account alias, see Using an alias for your\n account ID in the IAM User Guide.

", + "smithy.api#documentation": "

Lists the account alias associated with the Amazon Web Services account (Note: you can have only\n one). For information about using an Amazon Web Services account alias, see Using an alias for your\n Amazon Web Services account ID in the IAM User Guide.

", "smithy.api#paginated": { "inputToken": "Marker", "outputToken": "Marker", @@ -6769,7 +6769,7 @@ } ], "traits": { - "smithy.api#documentation": "

Lists information about the IAM OpenID Connect (OIDC) provider resource objects\n defined in the account.

\n \n

IAM resource-listing operations return a subset of the available \n attributes for the resource. For example, this operation does not return tags, even though they are an attribute of the returned object. To view all of the information for an OIDC provider, see GetOpenIDConnectProvider.

\n " + "smithy.api#documentation": "

Lists information about the IAM OpenID Connect (OIDC) provider resource objects\n defined in the Amazon Web Services account.

\n \n

IAM resource-listing operations return a subset of the available \n attributes for the resource. For example, this operation does not return tags, even though they are an attribute of the returned object. To view all of the information for an OIDC provider, see GetOpenIDConnectProvider.

\n " } }, "com.amazonaws.iam#ListOpenIDConnectProvidersRequest": { @@ -6782,7 +6782,7 @@ "OpenIDConnectProviderList": { "target": "com.amazonaws.iam#OpenIDConnectProviderListType", "traits": { - "smithy.api#documentation": "

The list of IAM OIDC provider resource objects defined in the account.

" + "smithy.api#documentation": "

The list of IAM OIDC provider resource objects defined in the Amazon Web Services account.

" } } }, @@ -6804,7 +6804,7 @@ } ], "traits": { - "smithy.api#documentation": "

Lists all the managed policies that are available in your account, including\n your own customer-defined managed policies and all Amazon Web Services managed policies.

\n

You can filter the list of policies that is returned using the optional\n OnlyAttached, Scope, and PathPrefix\n parameters. For example, to list only the customer managed policies in your Amazon Web Services\n account, set Scope to Local. To list only Amazon Web Services managed\n policies, set Scope to AWS.

\n

You can paginate the results using the MaxItems and Marker\n parameters.

\n

For more information about managed policies, see Managed policies and inline\n policies in the IAM User Guide.

\n \n

IAM resource-listing operations return a subset of the available \n attributes for the resource. For example, this operation does not return tags, even though they are an attribute of the returned object. To view all of the information for a customer manged policy, see\n GetPolicy.

\n ", + "smithy.api#documentation": "

Lists all the managed policies that are available in your Amazon Web Services account, including\n your own customer-defined managed policies and all Amazon Web Services managed policies.

\n

You can filter the list of policies that is returned using the optional\n OnlyAttached, Scope, and PathPrefix\n parameters. For example, to list only the customer managed policies in your Amazon Web Services\n account, set Scope to Local. To list only Amazon Web Services managed\n policies, set Scope to AWS.

\n

You can paginate the results using the MaxItems and Marker\n parameters.

\n

For more information about managed policies, see Managed policies and inline\n policies in the IAM User Guide.

\n \n

IAM resource-listing operations return a subset of the available \n attributes for the resource. For example, this operation does not return tags, even though they are an attribute of the returned object. To view all of the information for a customer manged policy, see\n GetPolicy.

\n ", "smithy.api#paginated": { "inputToken": "Marker", "outputToken": "Marker", @@ -6908,7 +6908,7 @@ "Scope": { "target": "com.amazonaws.iam#policyScopeType", "traits": { - "smithy.api#documentation": "

The scope to use for filtering the results.

\n

To list only Amazon Web Services managed policies, set Scope to AWS. To\n list only the customer managed policies in your account, set Scope to\n Local.

\n

This parameter is optional. If it is not included, or if it is set to\n All, all policies are returned.

" + "smithy.api#documentation": "

The scope to use for filtering the results.

\n

To list only Amazon Web Services managed policies, set Scope to AWS. To\n list only the customer managed policies in your Amazon Web Services account, set Scope to\n Local.

\n

This parameter is optional. If it is not included, or if it is set to\n All, all policies are returned.

" } }, "OnlyAttached": { @@ -7721,7 +7721,7 @@ } ], "traits": { - "smithy.api#documentation": "

Returns information about the signing certificates associated with the specified IAM\n user. If none exists, the operation returns an empty list.

\n

Although each user is limited to a small number of signing certificates, you can still\n paginate the results using the MaxItems and Marker\n parameters.

\n

If the UserName field is not specified, the user name is determined\n implicitly based on the Amazon Web Services access key ID used to sign the request for this operation.\n This operation works for access keys under the account. Consequently, you can use\n this operation to manage account root user credentials even if the account\n has no associated users.

", + "smithy.api#documentation": "

Returns information about the signing certificates associated with the specified IAM\n user. If none exists, the operation returns an empty list.

\n

Although each user is limited to a small number of signing certificates, you can still\n paginate the results using the MaxItems and Marker\n parameters.

\n

If the UserName field is not specified, the user name is determined\n implicitly based on the Amazon Web Services access key ID used to sign the request for this operation.\n This operation works for access keys under the Amazon Web Services account. Consequently, you can use\n this operation to manage Amazon Web Services account root user credentials even if the Amazon Web Services account\n has no associated users.

", "smithy.api#paginated": { "inputToken": "Marker", "outputToken": "Marker", @@ -7945,7 +7945,7 @@ } ], "traits": { - "smithy.api#documentation": "

Lists the IAM users that have the specified path prefix. If no path prefix is\n specified, the operation returns all users in the account. If there are none, the\n operation returns an empty list.

\n \n

IAM resource-listing operations return a subset of the available \n attributes for the resource. For example, this operation does not return tags, even though they are an attribute of the returned object. To view all of the information for a user, see GetUser.

\n \n

You can paginate the results using the MaxItems and Marker\n parameters.

", + "smithy.api#documentation": "

Lists the IAM users that have the specified path prefix. If no path prefix is\n specified, the operation returns all users in the Amazon Web Services account. If there are none, the\n operation returns an empty list.

\n \n

IAM resource-listing operations return a subset of the available \n attributes for the resource. For example, this operation does not return tags, even though they are an attribute of the returned object. To view all of the information for a user, see GetUser.

\n \n

You can paginate the results using the MaxItems and Marker\n parameters.

", "smithy.api#paginated": { "inputToken": "Marker", "outputToken": "Marker", @@ -8013,7 +8013,7 @@ "target": "com.amazonaws.iam#ListVirtualMFADevicesResponse" }, "traits": { - "smithy.api#documentation": "

Lists the virtual MFA devices defined in the account by assignment status. If\n you do not specify an assignment status, the operation returns a list of all virtual MFA\n devices. Assignment status can be Assigned, Unassigned, or\n Any.

\n \n

IAM resource-listing operations return a subset of the available \n attributes for the resource. For example, this operation does not return tags, even though they are an attribute of the returned object. To view all of the information for a virtual MFA device, see\n ListVirtualMFADevices.

\n \n

You can paginate the results using the MaxItems and Marker\n parameters.

", + "smithy.api#documentation": "

Lists the virtual MFA devices defined in the Amazon Web Services account by assignment status. If\n you do not specify an assignment status, the operation returns a list of all virtual MFA\n devices. Assignment status can be Assigned, Unassigned, or\n Any.

\n \n

IAM resource-listing operations return a subset of the available \n attributes for the resource. For example, this operation does not return tags, even though they are an attribute of the returned object. To view all of the information for a virtual MFA device, see\n ListVirtualMFADevices.

\n \n

You can paginate the results using the MaxItems and Marker\n parameters.

", "smithy.api#paginated": { "inputToken": "Marker", "outputToken": "Marker", @@ -8078,7 +8078,7 @@ "UserName": { "target": "com.amazonaws.iam#userNameType", "traits": { - "smithy.api#documentation": "

The name of the user, which can be used for signing in to the Management Console.

", + "smithy.api#documentation": "

The name of the user, which can be used for signing in to the Amazon Web Services Management Console.

", "smithy.api#required": {} } }, @@ -9562,7 +9562,7 @@ "Region": { "target": "com.amazonaws.iam#stringType", "traits": { - "smithy.api#documentation": "

The name of the Region in which the role was last used.

" + "smithy.api#documentation": "

The name of the Amazon Web Services Region in which the role was last used.

" } } }, @@ -10078,7 +10078,7 @@ } ], "traits": { - "smithy.api#documentation": "

Sets the specified version of the global endpoint token as the token version used for\n the account.

\n

By default, Security Token Service (STS) is available as a global service, and all STS requests\n go to a single endpoint at https://sts.amazonaws.com. Amazon Web Services recommends\n using Regional STS endpoints to reduce latency, build in redundancy, and increase\n session token availability. For information about Regional endpoints for STS, see\n Security Token Service\n endpoints and quotas in the Amazon Web Services General Reference.

\n

If you make an STS call to the global endpoint, the resulting session tokens might\n be valid in some Regions but not others. It depends on the version that is set in this\n operation. Version 1 tokens are valid only in Regions that are\n available by default. These tokens do not work in manually enabled Regions, such as Asia\n Pacific (Hong Kong). Version 2 tokens are valid in all Regions. However, version 2\n tokens are longer and might affect systems where you temporarily store tokens. For\n information, see Activating and\n deactivating STS in an Region in the\n IAM User Guide.

\n

To view the current session token version, see the\n GlobalEndpointTokenVersion entry in the response of the GetAccountSummary operation.

" + "smithy.api#documentation": "

Sets the specified version of the global endpoint token as the token version used for\n the Amazon Web Services account.

\n

By default, Security Token Service (STS) is available as a global service, and all STS requests\n go to a single endpoint at https://sts.amazonaws.com. Amazon Web Services recommends\n using Regional STS endpoints to reduce latency, build in redundancy, and increase\n session token availability. For information about Regional endpoints for STS, see\n Security Token Service\n endpoints and quotas in the Amazon Web Services General Reference.

\n

If you make an STS call to the global endpoint, the resulting session tokens might\n be valid in some Regions but not others. It depends on the version that is set in this\n operation. Version 1 tokens are valid only in Amazon Web Services Regions that are\n available by default. These tokens do not work in manually enabled Regions, such as Asia\n Pacific (Hong Kong). Version 2 tokens are valid in all Regions. However, version 2\n tokens are longer and might affect systems where you temporarily store tokens. For\n information, see Activating and\n deactivating STS in an Amazon Web Services Region in the\n IAM User Guide.

\n

To view the current session token version, see the\n GlobalEndpointTokenVersion entry in the response of the GetAccountSummary operation.

" } }, "com.amazonaws.iam#SetSecurityTokenServicePreferencesRequest": { @@ -10087,7 +10087,7 @@ "GlobalEndpointTokenVersion": { "target": "com.amazonaws.iam#globalEndpointTokenVersion", "traits": { - "smithy.api#documentation": "

The version of the global endpoint token. Version 1 tokens are valid only in Regions that are available by default. These tokens do not work in\n manually enabled Regions, such as Asia Pacific (Hong Kong). Version 2 tokens are valid\n in all Regions. However, version 2 tokens are longer and might affect systems where you\n temporarily store tokens.

\n

For information, see Activating and\n deactivating STS in an Region in the\n IAM User Guide.

", + "smithy.api#documentation": "

The version of the global endpoint token. Version 1 tokens are valid only in Amazon Web Services Regions that are available by default. These tokens do not work in\n manually enabled Regions, such as Asia Pacific (Hong Kong). Version 2 tokens are valid\n in all Regions. However, version 2 tokens are longer and might affect systems where you\n temporarily store tokens.

\n

For information, see Activating and\n deactivating STS in an Amazon Web Services Region in the\n IAM User Guide.

", "smithy.api#required": {} } } @@ -10199,7 +10199,7 @@ "ResourceOwner": { "target": "com.amazonaws.iam#ResourceNameType", "traits": { - "smithy.api#documentation": "

An ARN representing the account ID that specifies the owner of any simulated\n resource that does not identify its owner in the resource ARN. Examples of resource ARNs\n include an S3 bucket or object. If ResourceOwner is specified, it is also\n used as the account owner of any ResourcePolicy included in the simulation.\n If the ResourceOwner parameter is not specified, then the owner of the\n resources and the resource policy defaults to the account of the identity provided in\n CallerArn. This parameter is required only if you specify a\n resource-based policy and account that owns the resource is different from the account\n that owns the simulated calling user CallerArn.

\n

The ARN for an account uses the following syntax:\n arn:aws:iam::AWS-account-ID:root. For example,\n to represent the account with the 112233445566 ID, use the following ARN:\n arn:aws:iam::112233445566-ID:root.

" + "smithy.api#documentation": "

An ARN representing the Amazon Web Services account ID that specifies the owner of any simulated\n resource that does not identify its owner in the resource ARN. Examples of resource ARNs\n include an S3 bucket or object. If ResourceOwner is specified, it is also\n used as the account owner of any ResourcePolicy included in the simulation.\n If the ResourceOwner parameter is not specified, then the owner of the\n resources and the resource policy defaults to the account of the identity provided in\n CallerArn. This parameter is required only if you specify a\n resource-based policy and account that owns the resource is different from the account\n that owns the simulated calling user CallerArn.

\n

The ARN for an account uses the following syntax:\n arn:aws:iam::AWS-account-ID:root. For example,\n to represent the account with the 112233445566 ID, use the following ARN:\n arn:aws:iam::112233445566-ID:root.

" } }, "CallerArn": { @@ -10333,7 +10333,7 @@ "ResourceOwner": { "target": "com.amazonaws.iam#ResourceNameType", "traits": { - "smithy.api#documentation": "

An account ID that specifies the owner of any simulated resource that does not\n identify its owner in the resource ARN. Examples of resource ARNs include an S3 bucket\n or object. If ResourceOwner is specified, it is also used as the account\n owner of any ResourcePolicy included in the simulation. If the\n ResourceOwner parameter is not specified, then the owner of the\n resources and the resource policy defaults to the account of the identity provided in\n CallerArn. This parameter is required only if you specify a\n resource-based policy and account that owns the resource is different from the account\n that owns the simulated calling user CallerArn.

" + "smithy.api#documentation": "

An Amazon Web Services account ID that specifies the owner of any simulated resource that does not\n identify its owner in the resource ARN. Examples of resource ARNs include an S3 bucket\n or object. If ResourceOwner is specified, it is also used as the account\n owner of any ResourcePolicy included in the simulation. If the\n ResourceOwner parameter is not specified, then the owner of the\n resources and the resource policy defaults to the account of the identity provided in\n CallerArn. This parameter is required only if you specify a\n resource-based policy and account that owns the resource is different from the account\n that owns the simulated calling user CallerArn.

" } }, "CallerArn": { @@ -11210,7 +11210,7 @@ } ], "traits": { - "smithy.api#documentation": "

Changes the status of the specified access key from Active to Inactive, or vice versa.\n This operation can be used to disable a user's key as part of a key rotation\n workflow.

\n

If the UserName is not specified, the user name is determined implicitly\n based on the Amazon Web Services access key ID used to sign the request. This operation works for\n access keys under the account. Consequently, you can use this operation to manage\n account root user credentials even if the account has no associated\n users.

\n

For information about rotating keys, see Managing keys and certificates\n in the IAM User Guide.

" + "smithy.api#documentation": "

Changes the status of the specified access key from Active to Inactive, or vice versa.\n This operation can be used to disable a user's key as part of a key rotation\n workflow.

\n

If the UserName is not specified, the user name is determined implicitly\n based on the Amazon Web Services access key ID used to sign the request. This operation works for\n access keys under the Amazon Web Services account. Consequently, you can use this operation to manage\n Amazon Web Services account root user credentials even if the Amazon Web Services account has no associated\n users.

\n

For information about rotating keys, see Managing keys and certificates\n in the IAM User Guide.

" } }, "com.amazonaws.iam#UpdateAccessKeyRequest": { @@ -11258,7 +11258,7 @@ } ], "traits": { - "smithy.api#documentation": "

Updates the password policy settings for the account.

\n \n \n \n

For more information about using a password policy, see Managing an IAM password\n policy in the IAM User Guide.

" + "smithy.api#documentation": "

Updates the password policy settings for the Amazon Web Services account.

\n \n \n \n

For more information about using a password policy, see Managing an IAM password\n policy in the IAM User Guide.

" } }, "com.amazonaws.iam#UpdateAccountPasswordPolicyRequest": { @@ -11297,7 +11297,7 @@ "AllowUsersToChangePassword": { "target": "com.amazonaws.iam#booleanType", "traits": { - "smithy.api#documentation": "

Allows all IAM users in your account to use the Management Console to change their own\n passwords. For more information, see Letting IAM users change their own\n passwords in the IAM User Guide.

\n

If you do not specify a value for this parameter, then the operation uses the default\n value of false. The result is that IAM users in the account do not\n automatically have permissions to change their own password.

" + "smithy.api#documentation": "

Allows all IAM users in your account to use the Amazon Web Services Management Console to change their own\n passwords. For more information, see Letting IAM users change their own\n passwords in the IAM User Guide.

\n

If you do not specify a value for this parameter, then the operation uses the default\n value of false. The result is that IAM users in the account do not\n automatically have permissions to change their own password.

" } }, "MaxPasswordAge": { @@ -11435,7 +11435,7 @@ } ], "traits": { - "smithy.api#documentation": "

Changes the password for the specified IAM user. You can use the CLI,\n the Amazon Web Services API, or the Users page in the IAM console\n to change the password for any IAM user. Use ChangePassword to\n change your own password in the My Security Credentials\n page in the Management Console.

\n

For more information about modifying passwords, see Managing passwords in the\n IAM User Guide.

" + "smithy.api#documentation": "

Changes the password for the specified IAM user. You can use the CLI,\n the Amazon Web Services API, or the Users page in the IAM console\n to change the password for any IAM user. Use ChangePassword to\n change your own password in the My Security Credentials\n page in the Amazon Web Services Management Console.

\n

For more information about modifying passwords, see Managing passwords in the\n IAM User Guide.

" } }, "com.amazonaws.iam#UpdateLoginProfileRequest": { @@ -11451,7 +11451,7 @@ "Password": { "target": "com.amazonaws.iam#passwordType", "traits": { - "smithy.api#documentation": "

The new password for the specified IAM user.

\n

The regex pattern \n used to validate this parameter is a string of characters consisting of the following:

\n \n

However, the format can be further restricted by the account administrator by setting\n a password policy on the account. For more information, see UpdateAccountPasswordPolicy.

" + "smithy.api#documentation": "

The new password for the specified IAM user.

\n

The regex pattern \n used to validate this parameter is a string of characters consisting of the following:

\n \n

However, the format can be further restricted by the account administrator by setting\n a password policy on the Amazon Web Services account. For more information, see UpdateAccountPasswordPolicy.

" } }, "PasswordResetRequired": { @@ -11807,7 +11807,7 @@ } ], "traits": { - "smithy.api#documentation": "

Changes the status of the specified user signing certificate from active to disabled,\n or vice versa. This operation can be used to disable an IAM user's signing certificate\n as part of a certificate rotation work flow.

\n

If the UserName field is not specified, the user name is determined\n implicitly based on the Amazon Web Services access key ID used to sign the request. This operation\n works for access keys under the account. Consequently, you can use this operation\n to manage account root user credentials even if the account has no\n associated users.

" + "smithy.api#documentation": "

Changes the status of the specified user signing certificate from active to disabled,\n or vice versa. This operation can be used to disable an IAM user's signing certificate\n as part of a certificate rotation work flow.

\n

If the UserName field is not specified, the user name is determined\n implicitly based on the Amazon Web Services access key ID used to sign the request. This operation\n works for access keys under the Amazon Web Services account. Consequently, you can use this operation\n to manage Amazon Web Services account root user credentials even if the Amazon Web Services account has no\n associated users.

" } }, "com.amazonaws.iam#UpdateSigningCertificateRequest": { @@ -11982,7 +11982,7 @@ } ], "traits": { - "smithy.api#documentation": "

Uploads a server certificate entity for the account. The server certificate\n entity includes a public key certificate, a private key, and an optional certificate\n chain, which should all be PEM-encoded.

\n

We recommend that you use Certificate Manager to provision, manage, and deploy your server certificates. With ACM\n you can request a certificate, deploy it to Amazon Web Services resources, and let ACM handle\n certificate renewals for you. Certificates provided by ACM are free. For more\n information about using ACM, see the Certificate Manager User Guide.

\n

For more information about working with server certificates, see Working\n with server certificates in the IAM User Guide. This\n topic includes a list of Amazon Web Services services that can use the server certificates that you\n manage with IAM.

\n

For information about the number of server certificates you can upload, see IAM and STS\n quotas in the IAM User Guide.

\n \n

Because the body of the public key certificate, private key, and the certificate\n chain can be large, you should use POST rather than GET when calling\n UploadServerCertificate. For information about setting up\n signatures and authorization through the API, see Signing Amazon Web Services API\n requests in the Amazon Web Services General Reference. For general\n information about using the Query API with IAM, see Calling the API by making HTTP query\n requests in the IAM User Guide.

\n " + "smithy.api#documentation": "

Uploads a server certificate entity for the Amazon Web Services account. The server certificate\n entity includes a public key certificate, a private key, and an optional certificate\n chain, which should all be PEM-encoded.

\n

We recommend that you use Certificate Manager to provision, manage, and deploy your server certificates. With ACM\n you can request a certificate, deploy it to Amazon Web Services resources, and let ACM handle\n certificate renewals for you. Certificates provided by ACM are free. For more\n information about using ACM, see the Certificate Manager User Guide.

\n

For more information about working with server certificates, see Working\n with server certificates in the IAM User Guide. This\n topic includes a list of Amazon Web Services services that can use the server certificates that you\n manage with IAM.

\n

For information about the number of server certificates you can upload, see IAM and STS\n quotas in the IAM User Guide.

\n \n

Because the body of the public key certificate, private key, and the certificate\n chain can be large, you should use POST rather than GET when calling\n UploadServerCertificate. For information about setting up\n signatures and authorization through the API, see Signing Amazon Web Services API\n requests in the Amazon Web Services General Reference. For general\n information about using the Query API with IAM, see Calling the API by making HTTP query\n requests in the IAM User Guide.

\n " } }, "com.amazonaws.iam#UploadServerCertificateRequest": { @@ -12081,7 +12081,7 @@ } ], "traits": { - "smithy.api#documentation": "

Uploads an X.509 signing certificate and associates it with the specified IAM user.\n Some Amazon Web Services services require you to use certificates to validate requests that are signed\n with a corresponding private key. When you upload the certificate, its default status is\n Active.

\n

For information about when you would use an X.509 signing certificate, see Managing\n server certificates in IAM in the\n IAM User Guide.

\n

If the UserName is not specified, the IAM user name is determined\n implicitly based on the Amazon Web Services access key ID used to sign the request. This operation\n works for access keys under the account. Consequently, you can use this operation\n to manage account root user credentials even if the account has no\n associated users.

\n \n

Because the body of an X.509 certificate can be large, you should use POST rather\n than GET when calling UploadSigningCertificate. For information about\n setting up signatures and authorization through the API, see Signing\n Amazon Web Services API requests in the Amazon Web Services General Reference. For\n general information about using the Query API with IAM, see Making query\n requests in the IAM User Guide.

\n " + "smithy.api#documentation": "

Uploads an X.509 signing certificate and associates it with the specified IAM user.\n Some Amazon Web Services services require you to use certificates to validate requests that are signed\n with a corresponding private key. When you upload the certificate, its default status is\n Active.

\n

For information about when you would use an X.509 signing certificate, see Managing\n server certificates in IAM in the\n IAM User Guide.

\n

If the UserName is not specified, the IAM user name is determined\n implicitly based on the Amazon Web Services access key ID used to sign the request. This operation\n works for access keys under the Amazon Web Services account. Consequently, you can use this operation\n to manage Amazon Web Services account root user credentials even if the Amazon Web Services account has no\n associated users.

\n \n

Because the body of an X.509 certificate can be large, you should use POST rather\n than GET when calling UploadSigningCertificate. For information about\n setting up signatures and authorization through the API, see Signing\n Amazon Web Services API requests in the Amazon Web Services General Reference. For\n general information about using the Query API with IAM, see Making query\n requests in the IAM User Guide.

\n " } }, "com.amazonaws.iam#UploadSigningCertificateRequest": { diff --git a/codegen/sdk-codegen/aws-models/imagebuilder.2019-12-02.json b/codegen/sdk-codegen/aws-models/imagebuilder.2019-12-02.json index 118cd67989b..1a1b087ed95 100644 --- a/codegen/sdk-codegen/aws-models/imagebuilder.2019-12-02.json +++ b/codegen/sdk-codegen/aws-models/imagebuilder.2019-12-02.json @@ -53,18 +53,18 @@ "systemsManagerAgent": { "target": "com.amazonaws.imagebuilder#SystemsManagerAgent", "traits": { - "smithy.api#documentation": "

Contains settings for the SSM agent on your build instance.

" + "smithy.api#documentation": "

Contains settings for the Systems Manager agent on your build instance.

" } }, "userDataOverride": { "target": "com.amazonaws.imagebuilder#UserDataOverride", "traits": { - "smithy.api#documentation": "

Use this property to provide commands or a command script to run when you launch \n\t\t\tyour build instance.

\n\t\t \n\t\t\t

The userDataOverride property replaces any commands that Image Builder might have added to ensure\n\t\t\t\tthat SSM is installed on your Linux build instance. If you override the user data,\n\t\t\t\tmake sure that you add commands to install SSM, if it is not pre-installed on your\n\t\t\t\tsource image.

\n\t\t " + "smithy.api#documentation": "

Use this property to provide commands or a command script to run when you launch \n\t\t\tyour build instance.

\n\t\t \n\t\t\t

The userDataOverride property replaces any commands that Image Builder might have added to ensure\n\t\t\t\tthat Systems Manager is installed on your Linux build instance. If you override the user data,\n\t\t\t\tmake sure that you add commands to install Systems Manager, if it is not pre-installed on your\n\t\t\t\tsource image.

\n\t\t " } } }, "traits": { - "smithy.api#documentation": "

In addition to your infrastruction configuration, these settings provide an extra layer of\n\t\t\tcontrol over your build instances. For instances where Image Builder installs the SSM agent,\n\t\t\tyou can choose whether to keep it for the AMI that you create. You can also specify commands \n\t\t\tto run on launch for all of your build instances.

" + "smithy.api#documentation": "

In addition to your infrastruction configuration, these settings provide an extra layer of\n\t\t\tcontrol over your build instances. For instances where Image Builder installs the Systems Manager agent,\n\t\t\tyou can choose whether to keep it for the AMI that you create. You can also specify commands \n\t\t\tto run on launch for all of your build instances.

" } }, "com.amazonaws.imagebuilder#Ami": { @@ -346,6 +346,12 @@ "smithy.api#documentation": "

The operating system (OS) version supported by the component. If the OS information is\n\t\t\tavailable, a prefix match is performed against the parent image OS version during image recipe\n\t\t\tcreation.

" } }, + "state": { + "target": "com.amazonaws.imagebuilder#ComponentState", + "traits": { + "smithy.api#documentation": "

Describes the current status of the component. This is used for \n\t\t\tcomponents that are no longer active.

" + } + }, "parameters": { "target": "com.amazonaws.imagebuilder#ComponentParameterDetailList", "traits": { @@ -563,6 +569,37 @@ "target": "com.amazonaws.imagebuilder#ComponentParameterValue" } }, + "com.amazonaws.imagebuilder#ComponentState": { + "type": "structure", + "members": { + "status": { + "target": "com.amazonaws.imagebuilder#ComponentStatus", + "traits": { + "smithy.api#documentation": "

The current state of the component.

" + } + }, + "reason": { + "target": "com.amazonaws.imagebuilder#NonEmptyString", + "traits": { + "smithy.api#documentation": "

Describes how or why the component changed state.

" + } + } + }, + "traits": { + "smithy.api#documentation": "

A group of fields that describe the current status of components \n\t\t\tthat are no longer active.

" + } + }, + "com.amazonaws.imagebuilder#ComponentStatus": { + "type": "string", + "traits": { + "smithy.api#enum": [ + { + "value": "DEPRECATED", + "name": "DEPRECATED" + } + ] + } + }, "com.amazonaws.imagebuilder#ComponentSummary": { "type": "structure", "members": { @@ -596,6 +633,12 @@ "smithy.api#documentation": "

The operating system (OS) version supported by the component. If the OS information is\n\t\t\tavailable, a prefix match is performed against the parent image OS version during image recipe\n\t\t\tcreation.

" } }, + "state": { + "target": "com.amazonaws.imagebuilder#ComponentState", + "traits": { + "smithy.api#documentation": "

Describes the current status of the component.

" + } + }, "type": { "target": "com.amazonaws.imagebuilder#ComponentType", "traits": { @@ -676,7 +719,7 @@ "version": { "target": "com.amazonaws.imagebuilder#VersionNumber", "traits": { - "smithy.api#documentation": "

The semantic version of the component.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Assignment: For the first three nodes you can assign any positive integer value, including \n\tzero, with an upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically assigns the \n\tbuild number, and that is not open for updates.

\n\t\t\t

\n Patterns: You can use any numeric pattern that adheres to the assignment requirements for \n\tthe nodes that you can assign. For example, you might choose a software version pattern, such as 1.0.0, or \n\ta date, such as 2021.01.01.

\n\t\t\t

\n Filtering: When you retrieve or reference a resource with a semantic version, you can use \n\twildcards (x) to filter your results. When you use a wildcard in any node, all nodes to the right of the \n\tfirst wildcard must also be wildcards. For example, specifying \"1.2.x\", or \"1.x.x\" works to filter list \n\tresults, but neither \"1.x.2\", nor \"x.2.x\" will work. You do not have to specify the build - Image Builder \n\tautomatically uses a wildcard for that, if applicable.

\n\t\t " + "smithy.api#documentation": "

The semantic version of the component.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Assignment: For the first three nodes you can assign any positive integer value, including \n\tzero, with an upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically assigns the \n\tbuild number to the fourth node.

\n\t\t\t

\n Patterns: You can use any numeric pattern that adheres to the assignment requirements for \n\tthe nodes that you can assign. For example, you might choose a software version pattern, such as 1.0.0, or \n\ta date, such as 2021.01.01.

\n\t\t\t

\n Filtering: With semantic versioning, you have the flexibility to use wildcards (x) \n\tto specify the most recent versions or nodes when selecting the source image or components for your \n\trecipe. When you use a wildcard in any node, all nodes to the right of the first wildcard must also be \n\twildcards.

\n\t\t " } }, "description": { @@ -833,7 +876,7 @@ "version": { "target": "com.amazonaws.imagebuilder#VersionNumber", "traits": { - "smithy.api#documentation": "

The semantic version of the container recipe.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Assignment: For the first three nodes you can assign any positive integer value, including \n\tzero, with an upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically assigns the \n\tbuild number, and that is not open for updates.

\n\t\t\t

\n Patterns: You can use any numeric pattern that adheres to the assignment requirements for \n\tthe nodes that you can assign. For example, you might choose a software version pattern, such as 1.0.0, or \n\ta date, such as 2021.01.01.

\n\t\t\t

\n Filtering: When you retrieve or reference a resource with a semantic version, you can use \n\twildcards (x) to filter your results. When you use a wildcard in any node, all nodes to the right of the \n\tfirst wildcard must also be wildcards. For example, specifying \"1.2.x\", or \"1.x.x\" works to filter list \n\tresults, but neither \"1.x.2\", nor \"x.2.x\" will work. You do not have to specify the build - Image Builder \n\tautomatically uses a wildcard for that, if applicable.

\n\t\t " + "smithy.api#documentation": "

The semantic version of the container recipe.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Assignment: For the first three nodes you can assign any positive integer value, including \n\tzero, with an upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically assigns the \n\tbuild number to the fourth node.

\n\t\t\t

\n Patterns: You can use any numeric pattern that adheres to the assignment requirements for \n\tthe nodes that you can assign. For example, you might choose a software version pattern, such as 1.0.0, or \n\ta date, such as 2021.01.01.

\n\t\t\t

\n Filtering: With semantic versioning, you have the flexibility to use wildcards (x) \n\tto specify the most recent versions or nodes when selecting the source image or components for your \n\trecipe. When you use a wildcard in any node, all nodes to the right of the first wildcard must also be \n\twildcards.

\n\t\t " } }, "components": { @@ -1056,7 +1099,7 @@ "semanticVersion": { "target": "com.amazonaws.imagebuilder#VersionNumber", "traits": { - "smithy.api#documentation": "

The semantic version of the component. This version follows the semantic version syntax.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Assignment: For the first three nodes you can assign any positive integer value, including \n\tzero, with an upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically assigns the \n\tbuild number, and that is not open for updates.

\n\t\t\t

\n Patterns: You can use any numeric pattern that adheres to the assignment requirements for \n\tthe nodes that you can assign. For example, you might choose a software version pattern, such as 1.0.0, or \n\ta date, such as 2021.01.01.

\n\t\t ", + "smithy.api#documentation": "

The semantic version of the component. This version follows the semantic version syntax.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Assignment: For the first three nodes you can assign any positive integer value, including \n\tzero, with an upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically assigns the \n\tbuild number to the fourth node.

\n\t\t\t

\n Patterns: You can use any numeric pattern that adheres to the assignment requirements for \n\tthe nodes that you can assign. For example, you might choose a software version pattern, such as 1.0.0, or \n\ta date, such as 2021.01.01.

\n\t\t ", "smithy.api#required": {} } }, @@ -1220,7 +1263,7 @@ "semanticVersion": { "target": "com.amazonaws.imagebuilder#VersionNumber", "traits": { - "smithy.api#documentation": "

The semantic version of the container recipe. This version follows the semantic version syntax.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Assignment: For the first three nodes you can assign any positive integer value, including \n\tzero, with an upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically assigns the \n\tbuild number, and that is not open for updates.

\n\t\t\t

\n Patterns: You can use any numeric pattern that adheres to the assignment requirements for \n\tthe nodes that you can assign. For example, you might choose a software version pattern, such as 1.0.0, or \n\ta date, such as 2021.01.01.

\n\t\t ", + "smithy.api#documentation": "

The semantic version of the container recipe. This version follows the semantic version syntax.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Assignment: For the first three nodes you can assign any positive integer value, including \n\tzero, with an upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically assigns the \n\tbuild number to the fourth node.

\n\t\t\t

\n Patterns: You can use any numeric pattern that adheres to the assignment requirements for \n\tthe nodes that you can assign. For example, you might choose a software version pattern, such as 1.0.0, or \n\ta date, such as 2021.01.01.

\n\t\t ", "smithy.api#required": {} } }, @@ -1710,7 +1753,7 @@ "semanticVersion": { "target": "com.amazonaws.imagebuilder#VersionNumber", "traits": { - "smithy.api#documentation": "

The semantic version of the image recipe. This version follows the semantic version syntax.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Assignment: For the first three nodes you can assign any positive integer value, including \n\tzero, with an upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically assigns the \n\tbuild number, and that is not open for updates.

\n\t\t\t

\n Patterns: You can use any numeric pattern that adheres to the assignment requirements for \n\tthe nodes that you can assign. For example, you might choose a software version pattern, such as 1.0.0, or \n\ta date, such as 2021.01.01.

\n\t\t ", + "smithy.api#documentation": "

The semantic version of the image recipe. This version follows the semantic version syntax.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Assignment: For the first three nodes you can assign any positive integer value, including \n\tzero, with an upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically assigns the \n\tbuild number to the fourth node.

\n\t\t\t

\n Patterns: You can use any numeric pattern that adheres to the assignment requirements for \n\tthe nodes that you can assign. For example, you might choose a software version pattern, such as 1.0.0, or \n\ta date, such as 2021.01.01.

\n\t\t ", "smithy.api#required": {} } }, @@ -1932,7 +1975,7 @@ "instanceTypes": { "target": "com.amazonaws.imagebuilder#InstanceTypeList", "traits": { - "smithy.api#documentation": "

The instance types of the infrastructure configuration. You can specify one or more\n\t\t\tinstance types to use for this build. The service will pick one of these instance types based\n\t\t\ton availability.

" + "smithy.api#documentation": "

The instance metadata options that you can set for the HTTP requests that pipeline builds\n\t\t\tuse to launch EC2 build and test instances. For more information about instance metadata\n\t\t\toptions, see one of the following links:

\n\t\t " } }, "instanceProfileName": { @@ -1963,7 +2006,7 @@ "keyPair": { "target": "com.amazonaws.imagebuilder#NonEmptyString", "traits": { - "smithy.api#documentation": "

The key pair of the infrastructure configuration. This can be used to log on to and debug\n\t\t\tthe instance used to create your image.

" + "smithy.api#documentation": "

The key pair of the infrastructure configuration. You can use this to log on to and debug\n\t\t\tthe instance used to create your image.

" } }, "terminateInstanceOnFailure": { @@ -1984,6 +2027,12 @@ "smithy.api#documentation": "

The tags attached to the resource created by Image Builder.

" } }, + "instanceMetadataOptions": { + "target": "com.amazonaws.imagebuilder#InstanceMetadataOptions", + "traits": { + "smithy.api#documentation": "

The instance metadata options that you can set for the HTTP requests that \n\t\t\tpipeline builds use to launch EC2 build and test instances.

" + } + }, "tags": { "target": "com.amazonaws.imagebuilder#TagMap", "traits": { @@ -2268,7 +2317,7 @@ } ], "traits": { - "smithy.api#documentation": "

Deletes an image.

", + "smithy.api#documentation": "

Deletes an Image Builder image resource. This does not delete any EC2 AMIs or ECR container images\n\t\t\tthat are created during the image build process. You must clean those up separately,\n\t\t\tusing the appropriate Amazon EC2 or Amazon ECR console actions, or API or CLI commands.

\n\t\t ", "smithy.api#http": { "method": "DELETE", "uri": "/DeleteImage", @@ -2422,7 +2471,7 @@ "imageBuildVersionArn": { "target": "com.amazonaws.imagebuilder#ImageBuildVersionArn", "traits": { - "smithy.api#documentation": "

The Amazon Resource Name (ARN) of the image to delete.

", + "smithy.api#documentation": "

The Amazon Resource Name (ARN) of the Image Builder image resource to delete.

", "smithy.api#httpQuery": "imageBuildVersionArn", "smithy.api#required": {} } @@ -2441,7 +2490,7 @@ "imageBuildVersionArn": { "target": "com.amazonaws.imagebuilder#ImageBuildVersionArn", "traits": { - "smithy.api#documentation": "

The Amazon Resource Name (ARN) of the image that was deleted.

" + "smithy.api#documentation": "

The Amazon Resource Name (ARN) of the Image Builder image resource that was deleted.

" } } } @@ -2737,6 +2786,12 @@ "traits": { "smithy.api#documentation": "

Use to override the device's volume type.

" } + }, + "throughput": { + "target": "com.amazonaws.imagebuilder#EbsVolumeThroughput", + "traits": { + "smithy.api#documentation": "

\n For GP3 volumes only – \n\t\t\tThe throughput in MiB/s that the volume supports.

" + } } }, "traits": { @@ -2749,7 +2804,7 @@ "smithy.api#box": {}, "smithy.api#range": { "min": 100, - "max": 10000 + "max": 64000 } } }, @@ -2763,6 +2818,16 @@ } } }, + "com.amazonaws.imagebuilder#EbsVolumeThroughput": { + "type": "integer", + "traits": { + "smithy.api#box": {}, + "smithy.api#range": { + "min": 125, + "max": 1000 + } + } + }, "com.amazonaws.imagebuilder#EbsVolumeType": { "type": "string", "traits": { @@ -3622,6 +3687,22 @@ "smithy.api#documentation": "

GetInfrastructureConfiguration response object.

" } }, + "com.amazonaws.imagebuilder#HttpPutResponseHopLimit": { + "type": "integer", + "traits": { + "smithy.api#box": {}, + "smithy.api#range": { + "min": 1, + "max": 64 + } + } + }, + "com.amazonaws.imagebuilder#HttpTokens": { + "type": "string", + "traits": { + "smithy.api#pattern": "^optional|required$" + } + }, "com.amazonaws.imagebuilder#IdempotentParameterMismatchException": { "type": "structure", "members": { @@ -3659,7 +3740,7 @@ "version": { "target": "com.amazonaws.imagebuilder#VersionNumber", "traits": { - "smithy.api#documentation": "

The semantic version of the image.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Assignment: For the first three nodes you can assign any positive integer value, including \n\tzero, with an upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically assigns the \n\tbuild number, and that is not open for updates.

\n\t\t\t

\n Patterns: You can use any numeric pattern that adheres to the assignment requirements for \n\tthe nodes that you can assign. For example, you might choose a software version pattern, such as 1.0.0, or \n\ta date, such as 2021.01.01.

\n\t\t\t

\n Filtering: When you retrieve or reference a resource with a semantic version, you can use \n\twildcards (x) to filter your results. When you use a wildcard in any node, all nodes to the right of the \n\tfirst wildcard must also be wildcards. For example, specifying \"1.2.x\", or \"1.x.x\" works to filter list \n\tresults, but neither \"1.x.2\", nor \"x.2.x\" will work. You do not have to specify the build - Image Builder \n\tautomatically uses a wildcard for that, if applicable.

\n\t\t " + "smithy.api#documentation": "

The semantic version of the image.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Assignment: For the first three nodes you can assign any positive integer value, including \n\tzero, with an upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically assigns the \n\tbuild number to the fourth node.

\n\t\t\t

\n Patterns: You can use any numeric pattern that adheres to the assignment requirements for \n\tthe nodes that you can assign. For example, you might choose a software version pattern, such as 1.0.0, or \n\ta date, such as 2021.01.01.

\n\t\t\t

\n Filtering: With semantic versioning, you have the flexibility to use wildcards (x) \n\tto specify the most recent versions or nodes when selecting the source image or components for your \n\trecipe. When you use a wildcard in any node, all nodes to the right of the first wildcard must also be \n\twildcards.

\n\t\t " } }, "platform": { @@ -4285,7 +4366,7 @@ "version": { "target": "com.amazonaws.imagebuilder#VersionNumber", "traits": { - "smithy.api#documentation": "

Details for a specific version of an Image Builder image. This version follows the semantic version syntax.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Assignment: For the first three nodes you can assign any positive integer value, including \n\tzero, with an upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically assigns the \n\tbuild number, and that is not open for updates.

\n\t\t\t

\n Patterns: You can use any numeric pattern that adheres to the assignment requirements for \n\tthe nodes that you can assign. For example, you might choose a software version pattern, such as 1.0.0, or \n\ta date, such as 2021.01.01.

\n\t\t\t

\n Filtering: When you retrieve or reference a resource with a semantic version, you can use \n\twildcards (x) to filter your results. When you use a wildcard in any node, all nodes to the right of the \n\tfirst wildcard must also be wildcards. For example, specifying \"1.2.x\", or \"1.x.x\" works to filter list \n\tresults, but neither \"1.x.2\", nor \"x.2.x\" will work. You do not have to specify the build - Image Builder \n\tautomatically uses a wildcard for that, if applicable.

\n\t\t " + "smithy.api#documentation": "

Details for a specific version of an Image Builder image. This version follows the semantic version syntax.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Assignment: For the first three nodes you can assign any positive integer value, including \n\tzero, with an upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically assigns the \n\tbuild number to the fourth node.

\n\t\t\t

\n Patterns: You can use any numeric pattern that adheres to the assignment requirements for \n\tthe nodes that you can assign. For example, you might choose a software version pattern, such as 1.0.0, or \n\ta date, such as 2021.01.01.

\n\t\t\t

\n Filtering: With semantic versioning, you have the flexibility to use wildcards (x) \n\tto specify the most recent versions or nodes when selecting the source image or components for your \n\trecipe. When you use a wildcard in any node, all nodes to the right of the first wildcard must also be \n\twildcards.

\n\t\t " } }, "platform": { @@ -4397,7 +4478,7 @@ "semanticVersion": { "target": "com.amazonaws.imagebuilder#VersionNumber", "traits": { - "smithy.api#documentation": "

The semantic version of the component. This version follows the semantic version syntax.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Filtering: When you retrieve or reference a resource with a semantic version, you can use \n\twildcards (x) to filter your results. When you use a wildcard in any node, all nodes to the right of the \n\tfirst wildcard must also be wildcards. For example, specifying \"1.2.x\", or \"1.x.x\" works to filter list \n\tresults, but neither \"1.x.2\", nor \"x.2.x\" will work. You do not have to specify the build - Image Builder \n\tautomatically uses a wildcard for that, if applicable.

\n\t\t ", + "smithy.api#documentation": "

The semantic version of the component. This version follows the semantic version syntax.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Filtering: With semantic versioning, you have the flexibility to use wildcards (x) \n\tto specify the most recent versions or nodes when selecting the source image or components for your \n\trecipe. When you use a wildcard in any node, all nodes to the right of the first wildcard must also be \n\twildcards.

\n\t\t ", "smithy.api#required": {} } }, @@ -4578,6 +4659,12 @@ "smithy.api#documentation": "

The tags attached to the resource created by Image Builder.

" } }, + "instanceMetadataOptions": { + "target": "com.amazonaws.imagebuilder#InstanceMetadataOptions", + "traits": { + "smithy.api#documentation": "

The instance metadata option settings for the infrastructure configuration.

" + } + }, "tags": { "target": "com.amazonaws.imagebuilder#TagMap", "traits": { @@ -4741,6 +4828,26 @@ "smithy.api#documentation": "

Defines a custom source AMI and block device mapping configurations of an instance \n\t\t\tused for building and testing container images.

" } }, + "com.amazonaws.imagebuilder#InstanceMetadataOptions": { + "type": "structure", + "members": { + "httpTokens": { + "target": "com.amazonaws.imagebuilder#HttpTokens", + "traits": { + "smithy.api#documentation": "

Indicates whether a signed token header is required for instance metadata retrieval requests. \n\t\t\tThe values affect the response as follows:

\n\t\t \n\t\t

The default setting is optional.

" + } + }, + "httpPutResponseHopLimit": { + "target": "com.amazonaws.imagebuilder#HttpPutResponseHopLimit", + "traits": { + "smithy.api#documentation": "

Limit the number of hops that an instance metadata request can traverse to reach its\n\t\t\tdestination.

" + } + } + }, + "traits": { + "smithy.api#documentation": "

The instance metadata options that apply to the HTTP requests that \n\t\t\tpipeline builds use to launch EC2 build and test instances. For more \n\t\t\tinformation about instance metadata options, see Configure \n\t\t\t\tthe instance metadata options in the \n Amazon EC2 User Guide\n \n\t\t\tfor Linux instances, or Configure \n\t\t\t\tthe instance metadata options in the \n Amazon EC2 Windows Guide\n \n\t\t\tfor Windows instances.

" + } + }, "com.amazonaws.imagebuilder#InstanceProfileNameType": { "type": "string", "traits": { @@ -4953,7 +5060,7 @@ } ], "traits": { - "smithy.api#documentation": "

Returns the list of component build versions for the specified semantic version.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Filtering: When you retrieve or reference a resource with a semantic version, you can use \n\twildcards (x) to filter your results. When you use a wildcard in any node, all nodes to the right of the \n\tfirst wildcard must also be wildcards. For example, specifying \"1.2.x\", or \"1.x.x\" works to filter list \n\tresults, but neither \"1.x.2\", nor \"x.2.x\" will work. You do not have to specify the build - Image Builder \n\tautomatically uses a wildcard for that, if applicable.

\n\t\t ", + "smithy.api#documentation": "

Returns the list of component build versions for the specified semantic version.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Filtering: With semantic versioning, you have the flexibility to use wildcards (x) \n\tto specify the most recent versions or nodes when selecting the source image or components for your \n\trecipe. When you use a wildcard in any node, all nodes to the right of the first wildcard must also be \n\twildcards.

\n\t\t ", "smithy.api#http": { "method": "POST", "uri": "/ListComponentBuildVersions", @@ -5046,7 +5153,7 @@ } ], "traits": { - "smithy.api#documentation": "

Returns the list of component build versions for the specified semantic version.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Filtering: When you retrieve or reference a resource with a semantic version, you can use \n\twildcards (x) to filter your results. When you use a wildcard in any node, all nodes to the right of the \n\tfirst wildcard must also be wildcards. For example, specifying \"1.2.x\", or \"1.x.x\" works to filter list \n\tresults, but neither \"1.x.2\", nor \"x.2.x\" will work. You do not have to specify the build - Image Builder \n\tautomatically uses a wildcard for that, if applicable.

\n\t\t ", + "smithy.api#documentation": "

Returns the list of component build versions for the specified semantic version.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Filtering: With semantic versioning, you have the flexibility to use wildcards (x) \n\tto specify the most recent versions or nodes when selecting the source image or components for your \n\trecipe. When you use a wildcard in any node, all nodes to the right of the first wildcard must also be \n\twildcards.

\n\t\t ", "smithy.api#http": { "method": "POST", "uri": "/ListComponents", @@ -5442,7 +5549,7 @@ } ], "traits": { - "smithy.api#documentation": "

List the Packages that are associated with an Image Build Version, as determined by Amazon EC2 Systems Manager Inventory at build time.

", + "smithy.api#documentation": "

List the Packages that are associated with an Image Build Version, as determined by Amazon Web Services Systems Manager Inventory at build time.

", "smithy.api#http": { "method": "POST", "uri": "/ListImagePackages", @@ -5894,7 +6001,7 @@ "imageVersionList": { "target": "com.amazonaws.imagebuilder#ImageVersionList", "traits": { - "smithy.api#documentation": "

The list of image semantic versions.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Filtering: When you retrieve or reference a resource with a semantic version, you can use \n\twildcards (x) to filter your results. When you use a wildcard in any node, all nodes to the right of the \n\tfirst wildcard must also be wildcards. For example, specifying \"1.2.x\", or \"1.x.x\" works to filter list \n\tresults, but neither \"1.x.2\", nor \"x.2.x\" will work. You do not have to specify the build - Image Builder \n\tautomatically uses a wildcard for that, if applicable.

\n\t\t " + "smithy.api#documentation": "

The list of image semantic versions.

\n\t\t \n\t\t\t

The semantic version has four nodes: ../. \n\tYou can assign values for the first three, and can filter on all of them.

\n\t\t\t

\n Filtering: With semantic versioning, you have the flexibility to use wildcards (x) \n\tto specify the most recent versions or nodes when selecting the source image or components for your \n\trecipe. When you use a wildcard in any node, all nodes to the right of the first wildcard must also be \n\twildcards.

\n\t\t " } }, "nextToken": { @@ -6802,12 +6909,12 @@ "uninstallAfterBuild": { "target": "com.amazonaws.imagebuilder#NullableBoolean", "traits": { - "smithy.api#documentation": "

Controls whether the SSM agent is removed from your final build image, prior to creating \n\t\t\tthe new AMI. If this is set to true, then the agent is removed from the final image. If it's \n\t\t\tset to false, then the agent is left in, so that it is included in the new AMI. The default \n\t\t\tvalue is false.

" + "smithy.api#documentation": "

Controls whether the Systems Manager agent is removed from your final build image, prior to creating \n\t\t\tthe new AMI. If this is set to true, then the agent is removed from the final image. If it's \n\t\t\tset to false, then the agent is left in, so that it is included in the new AMI. The default \n\t\t\tvalue is false.

" } } }, "traits": { - "smithy.api#documentation": "

Contains settings for the SSM agent on your build instance.

" + "smithy.api#documentation": "

Contains settings for the Systems Manager agent on your build instance.

" } }, "com.amazonaws.imagebuilder#TagKey": { @@ -7329,7 +7436,7 @@ "keyPair": { "target": "com.amazonaws.imagebuilder#NonEmptyString", "traits": { - "smithy.api#documentation": "

The key pair of the infrastructure configuration. This can be used to log on to and debug\n\t\t\tthe instance used to create your image.

" + "smithy.api#documentation": "

The key pair of the infrastructure configuration. You can use this to log on to and debug\n\t\t\tthe instance used to create your image.

" } }, "terminateInstanceOnFailure": { @@ -7357,6 +7464,12 @@ "traits": { "smithy.api#documentation": "

The tags attached to the resource created by Image Builder.

" } + }, + "instanceMetadataOptions": { + "target": "com.amazonaws.imagebuilder#InstanceMetadataOptions", + "traits": { + "smithy.api#documentation": "

The instance metadata options that you can set for the HTTP requests that pipeline builds\n\t\t\tuse to launch EC2 build and test instances. For more information about instance metadata\n\t\t\toptions, see one of the following links:

\n\t\t " + } } } }, diff --git a/codegen/sdk-codegen/aws-models/iot.2015-05-28.json b/codegen/sdk-codegen/aws-models/iot.2015-05-28.json index 6a4c973fc23..94a4550b655 100644 --- a/codegen/sdk-codegen/aws-models/iot.2015-05-28.json +++ b/codegen/sdk-codegen/aws-models/iot.2015-05-28.json @@ -585,6 +585,9 @@ { "target": "com.amazonaws.iot#ListViolationEvents" }, + { + "target": "com.amazonaws.iot#PutVerificationStateOnViolation" + }, { "target": "com.amazonaws.iot#RegisterCACertificate" }, @@ -979,7 +982,7 @@ "elasticsearch": { "target": "com.amazonaws.iot#ElasticsearchAction", "traits": { - "smithy.api#documentation": "

Write data to an Amazon Elasticsearch Service domain.

\n \n

This action is deprecated. Use the OpenSearch action instead.

\n " + "smithy.api#documentation": "

Write data to an Amazon OpenSearch Service domain.

\n \n

The Elasticsearch action can only be used by existing rule actions. \n To create a new rule action or to update an existing rule action, use the\n OpenSearch rule action instead. For more information, see \n OpenSearchAction.

\n " } }, "salesforce": { @@ -1115,6 +1118,18 @@ "smithy.api#documentation": "

\n The details of a violation event.\n

" } }, + "verificationState": { + "target": "com.amazonaws.iot#VerificationState", + "traits": { + "smithy.api#documentation": "

The verification state of the violation (detect alarm).

" + } + }, + "verificationStateDescription": { + "target": "com.amazonaws.iot#VerificationStateDescription", + "traits": { + "smithy.api#documentation": "

The description of the verification state of the violation.

" + } + }, "lastViolationTime": { "target": "com.amazonaws.iot#Timestamp", "traits": { @@ -4850,7 +4865,7 @@ "clientRequestToken": { "target": "com.amazonaws.iot#ClientRequestToken", "traits": { - "smithy.api#documentation": "

\n The epoch timestamp in seconds at which this suppression expires.\n

", + "smithy.api#documentation": "

\n Each audit supression must have a unique client request token. If you try to create a new audit\n suppression with the same token as one that already exists, an exception occurs. If you omit this\n value, Amazon Web Services SDKs will automatically generate a unique client request.\n

", "smithy.api#idempotencyToken": {}, "smithy.api#required": {} } @@ -13090,21 +13105,21 @@ "roleArn": { "target": "com.amazonaws.iot#AwsArn", "traits": { - "smithy.api#documentation": "

The IAM role ARN that has access to Elasticsearch.

", + "smithy.api#documentation": "

The IAM role ARN that has access to OpenSearch.

", "smithy.api#required": {} } }, "endpoint": { "target": "com.amazonaws.iot#ElasticsearchEndpoint", "traits": { - "smithy.api#documentation": "

The endpoint of your Elasticsearch domain.

", + "smithy.api#documentation": "

The endpoint of your OpenSearch domain.

", "smithy.api#required": {} } }, "index": { "target": "com.amazonaws.iot#ElasticsearchIndex", "traits": { - "smithy.api#documentation": "

The Elasticsearch index where you want to store your data.

", + "smithy.api#documentation": "

The index where you want to store your data.

", "smithy.api#required": {} } }, @@ -13124,7 +13139,7 @@ } }, "traits": { - "smithy.api#documentation": "

Describes an action that writes data to an Amazon Elasticsearch Service\n domain.

\n \n

This action is deprecated. Use the OpenSearch action instead.

\n " + "smithy.api#documentation": "

Describes an action that writes data to an Amazon OpenSearch Service\n domain.

\n \n

The Elasticsearch action can only be used by existing rule actions. To create a\n new rule action or to update an existing rule action, use the\n OpenSearch rule action instead. For more information, see OpenSearchAction.

\n " } }, "com.amazonaws.iot#ElasticsearchEndpoint": { @@ -16391,6 +16406,13 @@ "smithy.api#httpQuery": "listSuppressedAlerts" } }, + "verificationState": { + "target": "com.amazonaws.iot#VerificationState", + "traits": { + "smithy.api#documentation": "

The verification state of the violation (detect alarm).

", + "smithy.api#httpQuery": "verificationState" + } + }, "nextToken": { "target": "com.amazonaws.iot#NextToken", "traits": { @@ -21033,6 +21055,13 @@ "smithy.api#httpQuery": "listSuppressedAlerts" } }, + "verificationState": { + "target": "com.amazonaws.iot#VerificationState", + "traits": { + "smithy.api#documentation": "

The verification state of the violation (detect alarm).

", + "smithy.api#httpQuery": "verificationState" + } + }, "nextToken": { "target": "com.amazonaws.iot#NextToken", "traits": { @@ -22650,6 +22679,64 @@ "smithy.api#documentation": "

The input for the DynamoActionVS action that specifies the DynamoDB table to which\n the message data will be written.

" } }, + "com.amazonaws.iot#PutVerificationStateOnViolation": { + "type": "operation", + "input": { + "target": "com.amazonaws.iot#PutVerificationStateOnViolationRequest" + }, + "output": { + "target": "com.amazonaws.iot#PutVerificationStateOnViolationResponse" + }, + "errors": [ + { + "target": "com.amazonaws.iot#InternalFailureException" + }, + { + "target": "com.amazonaws.iot#InvalidRequestException" + }, + { + "target": "com.amazonaws.iot#ThrottlingException" + } + ], + "traits": { + "smithy.api#documentation": "

Set a verification state and provide a description of that verification state on a violation (detect alarm).

", + "smithy.api#http": { + "method": "POST", + "uri": "/violations/verification-state/{violationId}", + "code": 200 + } + } + }, + "com.amazonaws.iot#PutVerificationStateOnViolationRequest": { + "type": "structure", + "members": { + "violationId": { + "target": "com.amazonaws.iot#ViolationId", + "traits": { + "smithy.api#documentation": "

The violation ID.

", + "smithy.api#httpLabel": {}, + "smithy.api#required": {} + } + }, + "verificationState": { + "target": "com.amazonaws.iot#VerificationState", + "traits": { + "smithy.api#documentation": "

The verification state of the violation.

", + "smithy.api#required": {} + } + }, + "verificationStateDescription": { + "target": "com.amazonaws.iot#VerificationStateDescription", + "traits": { + "smithy.api#documentation": "

The description of the verification state of the violation (detect alarm).

" + } + } + } + }, + "com.amazonaws.iot#PutVerificationStateOnViolationResponse": { + "type": "structure", + "members": {} + }, "com.amazonaws.iot#Qos": { "type": "integer", "traits": { @@ -29558,6 +29645,39 @@ "com.amazonaws.iot#Variance": { "type": "double" }, + "com.amazonaws.iot#VerificationState": { + "type": "string", + "traits": { + "smithy.api#enum": [ + { + "value": "FALSE_POSITIVE", + "name": "FALSE_POSITIVE" + }, + { + "value": "BENIGN_POSITIVE", + "name": "BENIGN_POSITIVE" + }, + { + "value": "TRUE_POSITIVE", + "name": "TRUE_POSITIVE" + }, + { + "value": "UNKNOWN", + "name": "UNKNOWN" + } + ] + } + }, + "com.amazonaws.iot#VerificationStateDescription": { + "type": "string", + "traits": { + "smithy.api#length": { + "min": 0, + "max": 1000 + }, + "smithy.api#pattern": "^[\\p{Graph}\\x20]*$" + } + }, "com.amazonaws.iot#Version": { "type": "long" }, @@ -29641,6 +29761,18 @@ "smithy.api#documentation": "

The type of violation event.

" } }, + "verificationState": { + "target": "com.amazonaws.iot#VerificationState", + "traits": { + "smithy.api#documentation": "

The verification state of the violation (detect alarm).

" + } + }, + "verificationStateDescription": { + "target": "com.amazonaws.iot#VerificationStateDescription", + "traits": { + "smithy.api#documentation": "

The description of the verification state of the violation.

" + } + }, "violationEventTime": { "target": "com.amazonaws.iot#Timestamp", "traits": { diff --git a/codegen/sdk-codegen/aws-models/lexmodelsv2.2020-08-07.json b/codegen/sdk-codegen/aws-models/lexmodelsv2.2020-08-07.json index 06f947c245f..e9a2526240c 100644 --- a/codegen/sdk-codegen/aws-models/lexmodelsv2.2020-08-07.json +++ b/codegen/sdk-codegen/aws-models/lexmodelsv2.2020-08-07.json @@ -29,6 +29,160 @@ ] }, "shapes": { + "com.amazonaws.lexmodelsv2#AggregatedUtterancesFilter": { + "type": "structure", + "members": { + "name": { + "target": "com.amazonaws.lexmodelsv2#AggregatedUtterancesFilterName", + "traits": { + "smithy.api#documentation": "

The name of the field to filter the utterance list.

", + "smithy.api#required": {} + } + }, + "values": { + "target": "com.amazonaws.lexmodelsv2#FilterValues", + "traits": { + "smithy.api#documentation": "

The value to use for filtering the list of bots.

", + "smithy.api#required": {} + } + }, + "operator": { + "target": "com.amazonaws.lexmodelsv2#AggregatedUtterancesFilterOperator", + "traits": { + "smithy.api#documentation": "

The operator to use for the filter. Specify EQ when the\n ListAggregatedUtterances operation should return only\n utterances that equal the specified value. Specify CO when\n the ListAggregatedUtterances operation should return\n utterances that contain the specified value.

", + "smithy.api#required": {} + } + } + }, + "traits": { + "smithy.api#documentation": "

Filters responses returned by the\n ListAggregatedUtterances operation.

" + } + }, + "com.amazonaws.lexmodelsv2#AggregatedUtterancesFilterName": { + "type": "string", + "traits": { + "smithy.api#enum": [ + { + "value": "Utterance", + "name": "Utterance" + } + ] + } + }, + "com.amazonaws.lexmodelsv2#AggregatedUtterancesFilterOperator": { + "type": "string", + "traits": { + "smithy.api#enum": [ + { + "value": "CO", + "name": "Contains" + }, + { + "value": "EQ", + "name": "Equals" + } + ] + } + }, + "com.amazonaws.lexmodelsv2#AggregatedUtterancesFilters": { + "type": "list", + "member": { + "target": "com.amazonaws.lexmodelsv2#AggregatedUtterancesFilter" + }, + "traits": { + "smithy.api#length": { + "min": 1, + "max": 1 + } + } + }, + "com.amazonaws.lexmodelsv2#AggregatedUtterancesSortAttribute": { + "type": "string", + "traits": { + "smithy.api#enum": [ + { + "value": "HitCount", + "name": "HitCount" + }, + { + "value": "MissedCount", + "name": "MissedCount" + } + ] + } + }, + "com.amazonaws.lexmodelsv2#AggregatedUtterancesSortBy": { + "type": "structure", + "members": { + "attribute": { + "target": "com.amazonaws.lexmodelsv2#AggregatedUtterancesSortAttribute", + "traits": { + "smithy.api#documentation": "

The utterance attribute to sort by.

", + "smithy.api#required": {} + } + }, + "order": { + "target": "com.amazonaws.lexmodelsv2#SortOrder", + "traits": { + "smithy.api#documentation": "

Specifies whether to sort the aggregated utterances in ascending or\n descending order.

", + "smithy.api#required": {} + } + } + }, + "traits": { + "smithy.api#documentation": "

Specifies attributes for sorting a list of utterances.

" + } + }, + "com.amazonaws.lexmodelsv2#AggregatedUtterancesSummary": { + "type": "structure", + "members": { + "utterance": { + "target": "com.amazonaws.lexmodelsv2#Utterance", + "traits": { + "smithy.api#documentation": "

The text of the utterance. If the utterance was used with the\n RecognizeUtterance operation, the text is the\n transcription of the audio utterance.

" + } + }, + "hitCount": { + "target": "com.amazonaws.lexmodelsv2#HitCount", + "traits": { + "smithy.api#documentation": "

The number of times that the utterance was detected by Amazon Lex during\n the time period. When an utterance is detected, it activates an intent\n or a slot.

" + } + }, + "missedCount": { + "target": "com.amazonaws.lexmodelsv2#MissedCount", + "traits": { + "smithy.api#documentation": "

The number of times that the utterance was missed by Amazon Lex An\n utterance is missed when it doesn't activate an intent or slot.

" + } + }, + "utteranceFirstRecordedInAggregationDuration": { + "target": "com.amazonaws.lexmodelsv2#Timestamp", + "traits": { + "smithy.api#documentation": "

The date and time that the utterance was first recorded in the time\n window for aggregation. An utterance may have been sent to Amazon Lex before\n that time, but only utterances within the time window are\n counted.

" + } + }, + "utteranceLastRecordedInAggregationDuration": { + "target": "com.amazonaws.lexmodelsv2#Timestamp", + "traits": { + "smithy.api#documentation": "

The last date and time that an utterance was recorded in the time\n window for aggregation. An utterance may be sent to Amazon Lex after that\n time, but only utterances within the time window are counted.

" + } + }, + "containsDataFromDeletedResources": { + "target": "com.amazonaws.lexmodelsv2#BoxedBoolean", + "traits": { + "smithy.api#documentation": "

Aggregated utterance data may contain utterances from versions of\n your bot that have since been deleted. When the aggregated contains\n this kind of data, this field is set to true.

" + } + } + }, + "traits": { + "smithy.api#documentation": "

Provides summary information for aggregated utterances. The\n ListAggregatedUtterances operations combines all\n instances of the same utterance into a single aggregated\n summary.

" + } + }, + "com.amazonaws.lexmodelsv2#AggregatedUtterancesSummaryList": { + "type": "list", + "member": { + "target": "com.amazonaws.lexmodelsv2#AggregatedUtterancesSummary" + } + }, "com.amazonaws.lexmodelsv2#AmazonResourceName": { "type": "string", "traits": { @@ -1348,7 +1502,7 @@ } }, "traits": { - "smithy.api#documentation": "

", + "smithy.api#documentation": "

The action that you tried to perform couldn't be completed because\n the resource is in a conflicting state. For example, deleting a bot\n that is in the CREATING state. Try your request again.

", "smithy.api#error": "client", "smithy.api#httpError": 409 } @@ -3759,6 +3913,65 @@ } } }, + "com.amazonaws.lexmodelsv2#DeleteUtterances": { + "type": "operation", + "input": { + "target": "com.amazonaws.lexmodelsv2#DeleteUtterancesRequest" + }, + "output": { + "target": "com.amazonaws.lexmodelsv2#DeleteUtterancesResponse" + }, + "errors": [ + { + "target": "com.amazonaws.lexmodelsv2#InternalServerException" + }, + { + "target": "com.amazonaws.lexmodelsv2#ThrottlingException" + }, + { + "target": "com.amazonaws.lexmodelsv2#ValidationException" + } + ], + "traits": { + "smithy.api#documentation": "

Deletes stored utterances.

\n

Amazon Lex stores the utterances that users send to your bot. Utterances\n are stored for 15 days for use with the operation, and then stored\n indefinitely for use in improving the ability of your bot to respond to\n user input..

\n

Use the DeleteUtterances operation to manually delete\n utterances for a specific session. When you use the\n DeleteUtterances operation, utterances stored for\n improving your bot's ability to respond to user input are deleted\n immediately. Utterances stored for use with the\n ListAggregatedUtterances operation are deleted after 15\n days.

", + "smithy.api#http": { + "method": "DELETE", + "uri": "/bots/{botId}/utterances", + "code": 204 + } + } + }, + "com.amazonaws.lexmodelsv2#DeleteUtterancesRequest": { + "type": "structure", + "members": { + "botId": { + "target": "com.amazonaws.lexmodelsv2#Id", + "traits": { + "smithy.api#documentation": "

The unique identifier of the bot that contains the\n utterances.

", + "smithy.api#httpLabel": {}, + "smithy.api#required": {} + } + }, + "localeId": { + "target": "com.amazonaws.lexmodelsv2#LocaleId", + "traits": { + "smithy.api#documentation": "

The identifier of the language and locale where the utterances were\n collected. The string must match one of the supported locales. For more\n information, see Supported\n languages.

", + "smithy.api#httpQuery": "localeId" + } + }, + "sessionId": { + "target": "com.amazonaws.lexmodelsv2#SessionId", + "traits": { + "smithy.api#documentation": "

The unique identifier of the session with the user. The ID is\n returned in the response from the and operations.

", + "smithy.api#httpQuery": "sessionId" + } + } + } + }, + "com.amazonaws.lexmodelsv2#DeleteUtterancesResponse": { + "type": "structure", + "members": {} + }, "com.amazonaws.lexmodelsv2#DescribeBot": { "type": "operation", "input": { @@ -5681,6 +5894,12 @@ "smithy.api#documentation": "

Determines if a Lambda function should be invoked for a specific\n intent.

" } }, + "com.amazonaws.lexmodelsv2#HitCount": { + "type": "integer", + "traits": { + "smithy.api#box": {} + } + }, "com.amazonaws.lexmodelsv2#Id": { "type": "string", "traits": { @@ -6201,7 +6420,7 @@ } }, "traits": { - "smithy.api#documentation": "

", + "smithy.api#documentation": "

The service encountered an unexpected condition. Try your request\n again.

", "smithy.api#error": "server", "smithy.api#httpError": 500 } @@ -6358,6 +6577,9 @@ { "target": "com.amazonaws.lexmodelsv2#DeleteSlotType" }, + { + "target": "com.amazonaws.lexmodelsv2#DeleteUtterances" + }, { "target": "com.amazonaws.lexmodelsv2#DescribeBot" }, @@ -6388,6 +6610,9 @@ { "target": "com.amazonaws.lexmodelsv2#DescribeSlotType" }, + { + "target": "com.amazonaws.lexmodelsv2#ListAggregatedUtterances" + }, { "target": "com.amazonaws.lexmodelsv2#ListBotAliases" }, @@ -6474,6 +6699,170 @@ "smithy.api#title": "Amazon Lex Model Building V2" } }, + "com.amazonaws.lexmodelsv2#ListAggregatedUtterances": { + "type": "operation", + "input": { + "target": "com.amazonaws.lexmodelsv2#ListAggregatedUtterancesRequest" + }, + "output": { + "target": "com.amazonaws.lexmodelsv2#ListAggregatedUtterancesResponse" + }, + "errors": [ + { + "target": "com.amazonaws.lexmodelsv2#InternalServerException" + }, + { + "target": "com.amazonaws.lexmodelsv2#PreconditionFailedException" + }, + { + "target": "com.amazonaws.lexmodelsv2#ThrottlingException" + }, + { + "target": "com.amazonaws.lexmodelsv2#ValidationException" + } + ], + "traits": { + "smithy.api#documentation": "

Provides a list of utterances that users have sent to the\n bot.

\n

Utterances are aggregated by the text of the utterance. For example,\n all instances where customers used the phrase \"I want to order pizza\"\n are aggregated into the same line in the response.

\n

You can see both detected utterances and missed utterances. A\n detected utterance is where the bot properly recognized the utterance\n and activated the associated intent. A missed utterance was not\n recognized by the bot and didn't activate an intent.

\n

Utterances can be aggregated for a bot alias or for a bot version,\n but not both at the same time.

\n

Utterances statistics are not generated under the following\n conditions:

\n ", + "smithy.api#http": { + "method": "POST", + "uri": "/bots/{botId}/aggregatedutterances", + "code": 200 + }, + "smithy.api#paginated": { + "inputToken": "nextToken", + "outputToken": "nextToken", + "pageSize": "maxResults" + } + } + }, + "com.amazonaws.lexmodelsv2#ListAggregatedUtterancesRequest": { + "type": "structure", + "members": { + "botId": { + "target": "com.amazonaws.lexmodelsv2#Id", + "traits": { + "smithy.api#documentation": "

The unique identifier of the bot associated with this\n request.

", + "smithy.api#httpLabel": {}, + "smithy.api#required": {} + } + }, + "botAliasId": { + "target": "com.amazonaws.lexmodelsv2#BotAliasId", + "traits": { + "smithy.api#documentation": "

The identifier of the bot alias associated with this request. If you\n specify the bot alias, you can't specify the bot version.

" + } + }, + "botVersion": { + "target": "com.amazonaws.lexmodelsv2#BotVersion", + "traits": { + "smithy.api#documentation": "

The identifier of the bot version associated with this request. If\n you specify the bot version, you can't specify the bot alias.

" + } + }, + "localeId": { + "target": "com.amazonaws.lexmodelsv2#LocaleId", + "traits": { + "smithy.api#documentation": "

The identifier of the language and locale where the utterances were\n collected. For more information, see Supported\n languages.

", + "smithy.api#required": {} + } + }, + "aggregationDuration": { + "target": "com.amazonaws.lexmodelsv2#UtteranceAggregationDuration", + "traits": { + "smithy.api#documentation": "

The time window for aggregating the utterance information. You can\n specify a time between one hour and two weeks.

", + "smithy.api#required": {} + } + }, + "sortBy": { + "target": "com.amazonaws.lexmodelsv2#AggregatedUtterancesSortBy", + "traits": { + "smithy.api#documentation": "

Specifies sorting parameters for the list of utterances. You can\n sort by the hit count, the missed count, or the number of distinct\n sessions the utterance appeared in.

" + } + }, + "filters": { + "target": "com.amazonaws.lexmodelsv2#AggregatedUtterancesFilters", + "traits": { + "smithy.api#documentation": "

Provides the specification of a filter used to limit the utterances\n in the response to only those that match the filter specification. You\n can only specify one filter and one string to filter on.

" + } + }, + "maxResults": { + "target": "com.amazonaws.lexmodelsv2#MaxResults", + "traits": { + "smithy.api#documentation": "

The maximum number of utterances to return in each page of results.\n If there are fewer results than the maximum page size, only the actual\n number of results are returned. If you don't specify the\n maxResults parameter, 1,000 results are\n returned.

" + } + }, + "nextToken": { + "target": "com.amazonaws.lexmodelsv2#NextToken", + "traits": { + "smithy.api#documentation": "

If the response from the ListAggregatedUtterances\n operation contains more results that specified in the\n maxResults parameter, a token is returned in the\n response. Use that token in the nextToken parameter to\n return the next page of results.

" + } + } + } + }, + "com.amazonaws.lexmodelsv2#ListAggregatedUtterancesResponse": { + "type": "structure", + "members": { + "botId": { + "target": "com.amazonaws.lexmodelsv2#Id", + "traits": { + "smithy.api#documentation": "

The identifier of the bot that contains the utterances.

" + } + }, + "botAliasId": { + "target": "com.amazonaws.lexmodelsv2#BotAliasId", + "traits": { + "smithy.api#documentation": "

The identifier of the bot alias that contains the utterances. If you\n specified the bot version, the bot alias ID isn't returned.

" + } + }, + "botVersion": { + "target": "com.amazonaws.lexmodelsv2#BotVersion", + "traits": { + "smithy.api#documentation": "

The identifier of the bot version that contains the utterances. If\n you specified the bot alias, the bot version isn't returned.

" + } + }, + "localeId": { + "target": "com.amazonaws.lexmodelsv2#LocaleId", + "traits": { + "smithy.api#documentation": "

The identifier of the language and locale that the utterances are\n in.

" + } + }, + "aggregationDuration": { + "target": "com.amazonaws.lexmodelsv2#UtteranceAggregationDuration", + "traits": { + "smithy.api#documentation": "

The time period used to aggregate the utterance data.

" + } + }, + "aggregationWindowStartTime": { + "target": "com.amazonaws.lexmodelsv2#Timestamp", + "traits": { + "smithy.api#documentation": "

The date and time that the aggregation window begins. Only data\n collected after this time is returned in the results.

" + } + }, + "aggregationWindowEndTime": { + "target": "com.amazonaws.lexmodelsv2#Timestamp", + "traits": { + "smithy.api#documentation": "

The date and time that the aggregation window ends. Only data\n collected between the start time and the end time are returned in the\n results.

" + } + }, + "aggregationLastRefreshedDateTime": { + "target": "com.amazonaws.lexmodelsv2#Timestamp", + "traits": { + "smithy.api#documentation": "

The last date and time that the aggregated data was collected. The\n time period depends on the length of the aggregation window.

\n " + } + }, + "aggregatedUtterancesSummaries": { + "target": "com.amazonaws.lexmodelsv2#AggregatedUtterancesSummaryList", + "traits": { + "smithy.api#documentation": "

Summaries of the aggregated utterance data. Each response contains\n information about the number of times that the utterance was seen\n during the time period, whether it was detected or missed, and when it\n was seen during the time period.

" + } + }, + "nextToken": { + "target": "com.amazonaws.lexmodelsv2#NextToken", + "traits": { + "smithy.api#documentation": "

A token that indicates whether there are more results to return in a\n response to the ListAggregatedUtterances operation. If the\n nextToken field is present, you send the contents as\n the nextToken parameter of a\n ListAggregatedUtterances operation request to get the\n next page of results.

" + } + } + } + }, "com.amazonaws.lexmodelsv2#ListBotAliases": { "type": "operation", "input": { @@ -7784,6 +8173,12 @@ } } }, + "com.amazonaws.lexmodelsv2#MissedCount": { + "type": "integer", + "traits": { + "smithy.api#box": {} + } + }, "com.amazonaws.lexmodelsv2#MultipleValuesSetting": { "type": "structure", "members": { @@ -7948,7 +8343,7 @@ } }, "traits": { - "smithy.api#documentation": "

", + "smithy.api#documentation": "

Your request couldn't be completed because one or more request\n fields aren't valid. Check the fields in your request and try\n again.

", "smithy.api#error": "client", "smithy.api#httpError": 412 } @@ -8060,8 +8455,30 @@ "traits": { "smithy.api#length": { "min": 1, - "max": 100 + "max": 300 + } + } + }, + "com.amazonaws.lexmodelsv2#RelativeAggregationDuration": { + "type": "structure", + "members": { + "timeDimension": { + "target": "com.amazonaws.lexmodelsv2#TimeDimension", + "traits": { + "smithy.api#documentation": "

The type of time period that the timeValue field\n represents.

", + "smithy.api#required": {} + } + }, + "timeValue": { + "target": "com.amazonaws.lexmodelsv2#TimeValue", + "traits": { + "smithy.api#documentation": "

The period of the time window to gather statistics for. The valid\n value depends on the setting of the timeDimension\n field.

\n ", + "smithy.api#required": {} + } } + }, + "traits": { + "smithy.api#documentation": "

Specifies the time window that utterance statistics are returned\n for. The time window is always relative to the last time that the that\n utterances were aggregated. For example, if the\n ListAggregatedUtterances operation is called at 1600,\n the time window is set to 1 hour, and the last refresh time was 1530,\n only utterances made between 1430 and 1530 are returned.

\n

You can choose the time window that statistics should be returned\n for.

\n " } }, "com.amazonaws.lexmodelsv2#ResourceCount": { @@ -8078,7 +8495,7 @@ } }, "traits": { - "smithy.api#documentation": "

", + "smithy.api#documentation": "

You asked to describe a resource that doesn't exist. Check the\n resource that you are requesting and try again.

", "smithy.api#error": "client", "smithy.api#httpError": 404 } @@ -8258,11 +8675,21 @@ } }, "traits": { - "smithy.api#documentation": "

", + "smithy.api#documentation": "

You have reached a quota for your bot.

", "smithy.api#error": "client", "smithy.api#httpError": 402 } }, + "com.amazonaws.lexmodelsv2#SessionId": { + "type": "string", + "traits": { + "smithy.api#length": { + "min": 2, + "max": 100 + }, + "smithy.api#pattern": "^[0-9a-zA-Z._:-]+$" + } + }, "com.amazonaws.lexmodelsv2#SessionTTL": { "type": "integer", "traits": { @@ -9148,11 +9575,39 @@ } }, "traits": { - "smithy.api#documentation": "

", + "smithy.api#documentation": "

Your request rate is too high. Reduce the frequency of\n requests.

", "smithy.api#error": "client", "smithy.api#httpError": 429 } }, + "com.amazonaws.lexmodelsv2#TimeDimension": { + "type": "string", + "traits": { + "smithy.api#enum": [ + { + "value": "Hours", + "name": "Hours" + }, + { + "value": "Days", + "name": "Days" + }, + { + "value": "Weeks", + "name": "Weeks" + } + ] + } + }, + "com.amazonaws.lexmodelsv2#TimeValue": { + "type": "integer", + "traits": { + "smithy.api#range": { + "min": 1, + "max": 24 + } + } + }, "com.amazonaws.lexmodelsv2#Timestamp": { "type": "timestamp" }, @@ -10493,6 +10948,21 @@ "com.amazonaws.lexmodelsv2#Utterance": { "type": "string" }, + "com.amazonaws.lexmodelsv2#UtteranceAggregationDuration": { + "type": "structure", + "members": { + "relativeAggregationDuration": { + "target": "com.amazonaws.lexmodelsv2#RelativeAggregationDuration", + "traits": { + "smithy.api#documentation": "

The desired time window for aggregating utterances.

", + "smithy.api#required": {} + } + } + }, + "traits": { + "smithy.api#documentation": "

Provides parameters for setting the time window and duration for\n aggregating utterance data.

" + } + }, "com.amazonaws.lexmodelsv2#ValidationException": { "type": "structure", "members": { @@ -10501,7 +10971,7 @@ } }, "traits": { - "smithy.api#documentation": "

", + "smithy.api#documentation": "

One of the input parameters in your request isn't valid. Check the\n parameters and try your request again.

", "smithy.api#error": "client", "smithy.api#httpError": 400 } diff --git a/codegen/sdk-codegen/aws-models/licensemanager.2018-08-01.json b/codegen/sdk-codegen/aws-models/licensemanager.2018-08-01.json index ea451520a3c..a7eeb16f2fb 100644 --- a/codegen/sdk-codegen/aws-models/licensemanager.2018-08-01.json +++ b/codegen/sdk-codegen/aws-models/licensemanager.2018-08-01.json @@ -57,6 +57,9 @@ { "target": "com.amazonaws.licensemanager#CreateLicenseConfiguration" }, + { + "target": "com.amazonaws.licensemanager#CreateLicenseConversionTaskForResource" + }, { "target": "com.amazonaws.licensemanager#CreateLicenseManagerReportGenerator" }, @@ -96,6 +99,9 @@ { "target": "com.amazonaws.licensemanager#GetLicenseConfiguration" }, + { + "target": "com.amazonaws.licensemanager#GetLicenseConversionTask" + }, { "target": "com.amazonaws.licensemanager#GetLicenseManagerReportGenerator" }, @@ -117,6 +123,9 @@ { "target": "com.amazonaws.licensemanager#ListLicenseConfigurations" }, + { + "target": "com.amazonaws.licensemanager#ListLicenseConversionTasks" + }, { "target": "com.amazonaws.licensemanager#ListLicenseManagerReportGenerators" }, @@ -181,7 +190,7 @@ "name": "license-manager" }, "aws.protocols#awsJson1_1": {}, - "smithy.api#documentation": " AWS License Manager \n

AWS License Manager makes it easier to manage licenses from software vendors across multiple \n AWS accounts and on-premises servers.

", + "smithy.api#documentation": "

License Manager makes it easier to manage licenses from software vendors across multiple \n Amazon Web Services accounts and on-premises servers.

", "smithy.api#title": "AWS License Manager", "smithy.api#xmlNamespace": { "uri": "https://license-manager.amazonaws.com/doc/2018_08_01" @@ -350,7 +359,7 @@ "code": "AuthorizationFailure", "httpResponseCode": 403 }, - "smithy.api#documentation": "

The AWS user account does not have permission to perform the action. Check the IAM\n policy associated with this account.

", + "smithy.api#documentation": "

The Amazon Web Services user account does not have permission to perform the action. Check the IAM\n policy associated with this account.

", "smithy.api#error": "client", "smithy.api#httpError": 403 } @@ -757,6 +766,12 @@ "traits": { "smithy.api#documentation": "

Date and time at which the license checkout expires.

" } + }, + "LicenseArn": { + "target": "com.amazonaws.licensemanager#String", + "traits": { + "smithy.api#documentation": "

Amazon Resource Name (ARN) of the checkout license.

" + } } } }, @@ -895,7 +910,7 @@ } ], "traits": { - "smithy.api#documentation": "

Creates a grant for the specified license. A grant shares the use of license entitlements with specific AWS accounts.

" + "smithy.api#documentation": "

Creates a grant for the specified license. A grant shares the use of license entitlements with specific Amazon Web Services accounts.

" } }, "com.amazonaws.licensemanager#CreateGrantRequest": { @@ -1039,7 +1054,10 @@ } }, "StatusReason": { - "target": "com.amazonaws.licensemanager#StatusReasonMessage" + "target": "com.amazonaws.licensemanager#StatusReasonMessage", + "traits": { + "smithy.api#documentation": "

Grant status reason.

" + } }, "SourceVersion": { "target": "com.amazonaws.licensemanager#String", @@ -1211,6 +1229,75 @@ } } }, + "com.amazonaws.licensemanager#CreateLicenseConversionTaskForResource": { + "type": "operation", + "input": { + "target": "com.amazonaws.licensemanager#CreateLicenseConversionTaskForResourceRequest" + }, + "output": { + "target": "com.amazonaws.licensemanager#CreateLicenseConversionTaskForResourceResponse" + }, + "errors": [ + { + "target": "com.amazonaws.licensemanager#AccessDeniedException" + }, + { + "target": "com.amazonaws.licensemanager#AuthorizationException" + }, + { + "target": "com.amazonaws.licensemanager#InvalidParameterValueException" + }, + { + "target": "com.amazonaws.licensemanager#RateLimitExceededException" + }, + { + "target": "com.amazonaws.licensemanager#ServerInternalException" + }, + { + "target": "com.amazonaws.licensemanager#ValidationException" + } + ], + "traits": { + "smithy.api#documentation": "

Creates a new license conversion task.

" + } + }, + "com.amazonaws.licensemanager#CreateLicenseConversionTaskForResourceRequest": { + "type": "structure", + "members": { + "ResourceArn": { + "target": "com.amazonaws.licensemanager#Arn", + "traits": { + "smithy.api#documentation": "

Amazon Resource Name (ARN) of the resource you are converting the license type for.

", + "smithy.api#required": {} + } + }, + "SourceLicenseContext": { + "target": "com.amazonaws.licensemanager#LicenseConversionContext", + "traits": { + "smithy.api#documentation": "

Information that identifies the license type you are converting from. \n For the structure of the source license, see Convert a license type using the AWS CLI in the License Manager User Guide.

", + "smithy.api#required": {} + } + }, + "DestinationLicenseContext": { + "target": "com.amazonaws.licensemanager#LicenseConversionContext", + "traits": { + "smithy.api#documentation": "

Information that identifies the license type you are converting to. For the structure of the destination license, see Convert a license type using the AWS CLI in the License Manager User Guide.

", + "smithy.api#required": {} + } + } + } + }, + "com.amazonaws.licensemanager#CreateLicenseConversionTaskForResourceResponse": { + "type": "structure", + "members": { + "LicenseConversionTaskId": { + "target": "com.amazonaws.licensemanager#LicenseConversionTaskId", + "traits": { + "smithy.api#documentation": "

The ID of the created license type conversion task.

" + } + } + } + }, "com.amazonaws.licensemanager#CreateLicenseManagerReportGenerator": { "type": "operation", "input": { @@ -1246,7 +1333,7 @@ } ], "traits": { - "smithy.api#documentation": "

Creates a new report generator.

" + "smithy.api#documentation": "

Creates a report generator.

" } }, "com.amazonaws.licensemanager#CreateLicenseManagerReportGeneratorRequest": { @@ -1262,7 +1349,7 @@ "Type": { "target": "com.amazonaws.licensemanager#ReportTypeList", "traits": { - "smithy.api#documentation": "

Type of reports to generate. The following report types an be generated:

\n ", + "smithy.api#documentation": "

Type of reports to generate. The following report types an be generated:

\n ", "smithy.api#required": {} } }, @@ -1307,7 +1394,7 @@ "LicenseManagerReportGeneratorArn": { "target": "com.amazonaws.licensemanager#String", "traits": { - "smithy.api#documentation": "

The Amazon Resource Number (ARN) of the new report generator.

" + "smithy.api#documentation": "

The Amazon Resource Name (ARN) of the new report generator.

" } } } @@ -1732,7 +1819,10 @@ } }, "StatusReason": { - "target": "com.amazonaws.licensemanager#StatusReasonMessage" + "target": "com.amazonaws.licensemanager#StatusReasonMessage", + "traits": { + "smithy.api#documentation": "

The Status reason for the delete request.

" + } }, "Version": { "target": "com.amazonaws.licensemanager#String", @@ -1884,7 +1974,7 @@ } ], "traits": { - "smithy.api#documentation": "

Delete an existing report generator.

\n

This action deletes the report generator, which stops it from generating future reports and cannot be reversed. However, the previous reports from this generator will remain in your S3 bucket.

" + "smithy.api#documentation": "

Deletes the specified report generator.

\n

This action deletes the report generator, which stops it from generating future reports.\n The action cannot be reversed. It has no effect on the previous reports from this generator.

" } }, "com.amazonaws.licensemanager#DeleteLicenseManagerReportGeneratorRequest": { @@ -1893,7 +1983,7 @@ "LicenseManagerReportGeneratorArn": { "target": "com.amazonaws.licensemanager#String", "traits": { - "smithy.api#documentation": "

Amazon Resource Number (ARN) of the report generator that will be deleted.

", + "smithy.api#documentation": "

Amazon Resource Name (ARN) of the report generator to be deleted.

", "smithy.api#required": {} } } @@ -1934,7 +2024,7 @@ "DeletionDate": { "target": "com.amazonaws.licensemanager#ISO8601DateTime", "traits": { - "smithy.api#documentation": "

Date on which the license is deleted.

" + "smithy.api#documentation": "

Date when the license is deleted.

" } } } @@ -2753,7 +2843,7 @@ "LicenseCountingType": { "target": "com.amazonaws.licensemanager#LicenseCountingType", "traits": { - "smithy.api#documentation": "

Dimension on which the licenses are counted.

" + "smithy.api#documentation": "

Dimension for which the licenses are counted.

" } }, "LicenseRules": { @@ -2830,6 +2920,106 @@ } } }, + "com.amazonaws.licensemanager#GetLicenseConversionTask": { + "type": "operation", + "input": { + "target": "com.amazonaws.licensemanager#GetLicenseConversionTaskRequest" + }, + "output": { + "target": "com.amazonaws.licensemanager#GetLicenseConversionTaskResponse" + }, + "errors": [ + { + "target": "com.amazonaws.licensemanager#AccessDeniedException" + }, + { + "target": "com.amazonaws.licensemanager#AuthorizationException" + }, + { + "target": "com.amazonaws.licensemanager#InvalidParameterValueException" + }, + { + "target": "com.amazonaws.licensemanager#RateLimitExceededException" + }, + { + "target": "com.amazonaws.licensemanager#ServerInternalException" + } + ], + "traits": { + "smithy.api#documentation": "

Gets information about the specified license type conversion task.

" + } + }, + "com.amazonaws.licensemanager#GetLicenseConversionTaskRequest": { + "type": "structure", + "members": { + "LicenseConversionTaskId": { + "target": "com.amazonaws.licensemanager#LicenseConversionTaskId", + "traits": { + "smithy.api#documentation": "

ID of the license type conversion task to retrieve information on.

", + "smithy.api#required": {} + } + } + } + }, + "com.amazonaws.licensemanager#GetLicenseConversionTaskResponse": { + "type": "structure", + "members": { + "LicenseConversionTaskId": { + "target": "com.amazonaws.licensemanager#LicenseConversionTaskId", + "traits": { + "smithy.api#documentation": "

ID of the license type conversion task.

" + } + }, + "ResourceArn": { + "target": "com.amazonaws.licensemanager#String", + "traits": { + "smithy.api#documentation": "

Amazon Resource Names (ARN) of the resources the license conversion task is associated with.

" + } + }, + "SourceLicenseContext": { + "target": "com.amazonaws.licensemanager#LicenseConversionContext", + "traits": { + "smithy.api#documentation": "

Information about the license type converted from.

" + } + }, + "DestinationLicenseContext": { + "target": "com.amazonaws.licensemanager#LicenseConversionContext", + "traits": { + "smithy.api#documentation": "

Information about the license type converted to.

" + } + }, + "StatusMessage": { + "target": "com.amazonaws.licensemanager#String", + "traits": { + "smithy.api#documentation": "

The status message for the conversion task.

" + } + }, + "Status": { + "target": "com.amazonaws.licensemanager#LicenseConversionTaskStatus", + "traits": { + "smithy.api#documentation": "

Status of the license type conversion task.

" + } + }, + "StartTime": { + "target": "com.amazonaws.licensemanager#DateTime", + "traits": { + "smithy.api#documentation": "

Time at which the license type conversion task was started .

" + } + }, + "LicenseConversionTime": { + "target": "com.amazonaws.licensemanager#DateTime", + "traits": { + "smithy.api#documentation": "

Amount of time to complete the license type conversion.

" + } + }, + "EndTime": { + "target": "com.amazonaws.licensemanager#DateTime", + "traits": { + "smithy.api#documentation": "

Time at which the license type conversion task was completed.

" + } + } + } + }, "com.amazonaws.licensemanager#GetLicenseManagerReportGenerator": { "type": "operation", "input": { @@ -2865,7 +3055,7 @@ } ], "traits": { - "smithy.api#documentation": "

Gets information on the specified report generator.

" + "smithy.api#documentation": "

Gets information about the specified report generator.

" } }, "com.amazonaws.licensemanager#GetLicenseManagerReportGeneratorRequest": { @@ -2874,7 +3064,7 @@ "LicenseManagerReportGeneratorArn": { "target": "com.amazonaws.licensemanager#String", "traits": { - "smithy.api#documentation": "

mazon Resource Number (ARN) of the report generator to retrieve information on.

", + "smithy.api#documentation": "

Amazon Resource Name (ARN) of the report generator.

", "smithy.api#required": {} } } @@ -2886,7 +3076,7 @@ "ReportGenerator": { "target": "com.amazonaws.licensemanager#ReportGenerator", "traits": { - "smithy.api#documentation": "

A report generator that creates periodic reports on your license configurations.

" + "smithy.api#documentation": "

A report generator that creates periodic reports about your license configurations.

" } } } @@ -3023,7 +3213,7 @@ "OrganizationConfiguration": { "target": "com.amazonaws.licensemanager#OrganizationConfiguration", "traits": { - "smithy.api#documentation": "

Indicates whether AWS Organizations is integrated with License Manager for\n cross-account discovery.

" + "smithy.api#documentation": "

Indicates whether Organizations is integrated with License Manager for\n cross-account discovery.

" } }, "EnableCrossAccountsDiscovery": { @@ -3035,7 +3225,7 @@ "LicenseManagerResourceShareArn": { "target": "com.amazonaws.licensemanager#String", "traits": { - "smithy.api#documentation": "

Amazon Resource Name (ARN) of the AWS resource share. The License Manager management account \n provides member accounts with access to this share.

" + "smithy.api#documentation": "

Amazon Resource Name (ARN) of the resource share. The License Manager management account \n provides member accounts with access to this share.

" } } } @@ -3390,7 +3580,7 @@ "SignKey": { "target": "com.amazonaws.licensemanager#String", "traits": { - "smithy.api#documentation": "

Asymmetric CMK from AWS Key Management Service. The CMK must have a key usage of sign and verify, \n and support the RSASSA-PSS SHA-256 signing algorithm.

" + "smithy.api#documentation": "

Asymmetric KMS key from Key Management Service. The KMS key must have a key usage of sign and verify, \n and support the RSASSA-PSS SHA-256 signing algorithm.

" } } }, @@ -3410,7 +3600,7 @@ "SignKey": { "target": "com.amazonaws.licensemanager#String", "traits": { - "smithy.api#documentation": "

Asymmetric CMK from AWS Key Management Service. The CMK must have a key usage of sign and verify, \n and support the RSASSA-PSS SHA-256 signing algorithm.

" + "smithy.api#documentation": "

Asymmetric KMS key from Key Management Service. The KMS key must have a key usage of sign and verify, \n and support the RSASSA-PSS SHA-256 signing algorithm.

" } }, "KeyFingerprint": { @@ -3513,7 +3703,7 @@ } }, "traits": { - "smithy.api#documentation": "

Software license that is managed in AWS License Manager.

" + "smithy.api#documentation": "

Software license that is managed in License Manager.

" } }, "com.amazonaws.licensemanager#LicenseConfiguration": { @@ -3638,7 +3828,7 @@ "ResourceOwnerId": { "target": "com.amazonaws.licensemanager#String", "traits": { - "smithy.api#documentation": "

ID of the AWS account that owns the resource consuming licenses.

" + "smithy.api#documentation": "

ID of the Amazon Web Services account that owns the resource consuming licenses.

" } }, "AssociationTime": { @@ -3735,6 +3925,117 @@ "target": "com.amazonaws.licensemanager#LicenseConfiguration" } }, + "com.amazonaws.licensemanager#LicenseConversionContext": { + "type": "structure", + "members": { + "UsageOperation": { + "target": "com.amazonaws.licensemanager#UsageOperation", + "traits": { + "smithy.api#documentation": "

The Usage operation value that corresponds to the license type you are converting your resource from. For more information about which platforms correspond to which usage operation values see Sample data: usage operation by platform\n \n

" + } + } + }, + "traits": { + "smithy.api#documentation": "

Information about a license type conversion task.

" + } + }, + "com.amazonaws.licensemanager#LicenseConversionTask": { + "type": "structure", + "members": { + "LicenseConversionTaskId": { + "target": "com.amazonaws.licensemanager#LicenseConversionTaskId", + "traits": { + "smithy.api#documentation": "

The ID of the license type conversion task.

" + } + }, + "ResourceArn": { + "target": "com.amazonaws.licensemanager#String", + "traits": { + "smithy.api#documentation": "

The Amazon Resource Name (ARN) of the resource associated with the license type\n conversion task.

" + } + }, + "SourceLicenseContext": { + "target": "com.amazonaws.licensemanager#LicenseConversionContext", + "traits": { + "smithy.api#documentation": "

Information about the license type this conversion task converted from.

" + } + }, + "DestinationLicenseContext": { + "target": "com.amazonaws.licensemanager#LicenseConversionContext", + "traits": { + "smithy.api#documentation": "

Information about the license type this conversion task converted to.

" + } + }, + "Status": { + "target": "com.amazonaws.licensemanager#LicenseConversionTaskStatus", + "traits": { + "smithy.api#documentation": "

The status of the conversion task.

" + } + }, + "StatusMessage": { + "target": "com.amazonaws.licensemanager#String", + "traits": { + "smithy.api#documentation": "

The status message for the conversion task.

" + } + }, + "StartTime": { + "target": "com.amazonaws.licensemanager#DateTime", + "traits": { + "smithy.api#documentation": "

The time the conversion task was started at.

" + } + }, + "LicenseConversionTime": { + "target": "com.amazonaws.licensemanager#DateTime", + "traits": { + "smithy.api#documentation": "

The time the usage operation value of the resource was changed.

" + } + }, + "EndTime": { + "target": "com.amazonaws.licensemanager#DateTime", + "traits": { + "smithy.api#documentation": "

The time the conversion task was completed.

" + } + } + }, + "traits": { + "smithy.api#documentation": "

Information about a license type conversion task.

" + } + }, + "com.amazonaws.licensemanager#LicenseConversionTaskId": { + "type": "string", + "traits": { + "smithy.api#length": { + "min": 0, + "max": 50 + }, + "smithy.api#pattern": "^lct-[a-zA-Z0-9]*$" + } + }, + "com.amazonaws.licensemanager#LicenseConversionTaskStatus": { + "type": "string", + "traits": { + "smithy.api#enum": [ + { + "value": "IN_PROGRESS", + "name": "IN_PROGRESS" + }, + { + "value": "SUCCEEDED", + "name": "SUCCEEDED" + }, + { + "value": "FAILED", + "name": "FAILED" + } + ] + } + }, + "com.amazonaws.licensemanager#LicenseConversionTasks": { + "type": "list", + "member": { + "target": "com.amazonaws.licensemanager#LicenseConversionTask" + } + }, "com.amazonaws.licensemanager#LicenseCountingType": { "type": "string", "traits": { @@ -3815,7 +4116,7 @@ "ResourceOwnerId": { "target": "com.amazonaws.licensemanager#String", "traits": { - "smithy.api#documentation": "

ID of the AWS account that owns the resource.

" + "smithy.api#documentation": "

ID of the Amazon Web Services account that owns the resource.

" } }, "OperationRequestedBy": { @@ -4214,7 +4515,7 @@ "Filters": { "target": "com.amazonaws.licensemanager#Filters", "traits": { - "smithy.api#documentation": "

Filters to scope the results. The following filters and logical operators\n are supported:

\n " + "smithy.api#documentation": "

Filters to scope the results. The following filters and logical operators\n are supported:

\n " } } } @@ -4236,6 +4537,75 @@ } } }, + "com.amazonaws.licensemanager#ListLicenseConversionTasks": { + "type": "operation", + "input": { + "target": "com.amazonaws.licensemanager#ListLicenseConversionTasksRequest" + }, + "output": { + "target": "com.amazonaws.licensemanager#ListLicenseConversionTasksResponse" + }, + "errors": [ + { + "target": "com.amazonaws.licensemanager#AccessDeniedException" + }, + { + "target": "com.amazonaws.licensemanager#AuthorizationException" + }, + { + "target": "com.amazonaws.licensemanager#InvalidParameterValueException" + }, + { + "target": "com.amazonaws.licensemanager#RateLimitExceededException" + }, + { + "target": "com.amazonaws.licensemanager#ServerInternalException" + } + ], + "traits": { + "smithy.api#documentation": "

Lists the license type conversion tasks for your account.

" + } + }, + "com.amazonaws.licensemanager#ListLicenseConversionTasksRequest": { + "type": "structure", + "members": { + "NextToken": { + "target": "com.amazonaws.licensemanager#String", + "traits": { + "smithy.api#documentation": "

Token for the next set of results.

" + } + }, + "MaxResults": { + "target": "com.amazonaws.licensemanager#BoxInteger", + "traits": { + "smithy.api#documentation": "

Maximum number of results to return in a single call.

" + } + }, + "Filters": { + "target": "com.amazonaws.licensemanager#Filters", + "traits": { + "smithy.api#documentation": "

\n Filters to scope the results. Valid filters are ResourceArns and Status.\n

" + } + } + } + }, + "com.amazonaws.licensemanager#ListLicenseConversionTasksResponse": { + "type": "structure", + "members": { + "LicenseConversionTasks": { + "target": "com.amazonaws.licensemanager#LicenseConversionTasks", + "traits": { + "smithy.api#documentation": "

Information about the license configuration tasks for your account.

" + } + }, + "NextToken": { + "target": "com.amazonaws.licensemanager#String", + "traits": { + "smithy.api#documentation": "

Token for the next set of results.

" + } + } + } + }, "com.amazonaws.licensemanager#ListLicenseManagerReportGenerators": { "type": "operation", "input": { @@ -4303,7 +4673,7 @@ "ReportGenerators": { "target": "com.amazonaws.licensemanager#ReportGeneratorList", "traits": { - "smithy.api#documentation": "

A report generator that creates periodic reports on your license configurations.

" + "smithy.api#documentation": "

A report generator that creates periodic reports about your license configurations.

" } }, "NextToken": { @@ -4747,7 +5117,7 @@ "Filters": { "target": "com.amazonaws.licensemanager#InventoryFilterList", "traits": { - "smithy.api#documentation": "

Filters to scope the results. The following filters and logical operators\n are supported:

\n " + "smithy.api#documentation": "

Filters to scope the results. The following filters and logical operators\n are supported:

\n " } } } @@ -5080,13 +5450,13 @@ "EnableIntegration": { "target": "com.amazonaws.licensemanager#Boolean", "traits": { - "smithy.api#documentation": "

Enables AWS Organization integration.

", + "smithy.api#documentation": "

Enables Organizations integration.

", "smithy.api#required": {} } } }, "traits": { - "smithy.api#documentation": "

Configuration information for AWS Organizations.

" + "smithy.api#documentation": "

Configuration information for Organizations.

" } }, "com.amazonaws.licensemanager#PrincipalArnList": { @@ -5114,7 +5484,7 @@ "ProductInformationFilterList": { "target": "com.amazonaws.licensemanager#ProductInformationFilterList", "traits": { - "smithy.api#documentation": "

A Product information filter consists of a ProductInformationFilterComparator which is a logical operator, a ProductInformationFilterName which specifies the type of filter being declared, and a ProductInformationFilterValue that specifies the value to filter on.

\n

Accepted values for ProductInformationFilterName are listed here along with descriptions and valid options for ProductInformationFilterComparator.

\n

The following filters and are supported when the resource type \n is SSM_MANAGED:

\n \n

The following filters and logical operators are supported when the resource type\n is RDS:

\n ", + "smithy.api#documentation": "

A Product information filter consists of a ProductInformationFilterComparator which is a logical operator, a ProductInformationFilterName which specifies the type of filter being declared, and a ProductInformationFilterValue that specifies the value to filter on.

\n

Accepted values for ProductInformationFilterName are listed here along with descriptions and valid options for ProductInformationFilterComparator.

\n

The following filters and are supported when the resource type \n is SSM_MANAGED:

\n \n

The following filters and logical operators are supported when the resource type\n is RDS:

\n ", "smithy.api#required": {} } } @@ -5205,7 +5575,10 @@ } }, "ReceivedStatusReason": { - "target": "com.amazonaws.licensemanager#StatusReasonMessage" + "target": "com.amazonaws.licensemanager#StatusReasonMessage", + "traits": { + "smithy.api#documentation": "

Received status reason.

" + } }, "AllowedOperations": { "target": "com.amazonaws.licensemanager#AllowedOperationList", @@ -5371,7 +5744,7 @@ "licenseConfigurationArns": { "target": "com.amazonaws.licensemanager#ArnList", "traits": { - "smithy.api#documentation": "

Amazon Resource Number (ARN) of the license configuration that this generator reports on.

", + "smithy.api#documentation": "

Amazon Resource Name (ARN) of the license configuration that this generator reports on.

", "smithy.api#required": {} } } @@ -5386,7 +5759,7 @@ "value": { "target": "com.amazonaws.licensemanager#Integer", "traits": { - "smithy.api#documentation": "

Number of times within the frequency period that a report will be generated. Currently only 1 is supported.

" + "smithy.api#documentation": "

Number of times within the frequency period that a report is generated. \n The only supported value is 1.

" } }, "period": { @@ -5397,7 +5770,7 @@ } }, "traits": { - "smithy.api#documentation": "

Details on how frequently reports are generated.

" + "smithy.api#documentation": "

Details about how frequently reports are generated.

" } }, "com.amazonaws.licensemanager#ReportFrequencyType": { @@ -5437,19 +5810,19 @@ "ReportContext": { "target": "com.amazonaws.licensemanager#ReportContext", "traits": { - "smithy.api#documentation": "

License configuration type this generator reports on.

" + "smithy.api#documentation": "

License configuration type for this generator.

" } }, "ReportFrequency": { "target": "com.amazonaws.licensemanager#ReportFrequency", "traits": { - "smithy.api#documentation": "

Details on how frequently reports are generated.

" + "smithy.api#documentation": "

Details about how frequently reports are generated.

" } }, "LicenseManagerReportGeneratorArn": { "target": "com.amazonaws.licensemanager#String", "traits": { - "smithy.api#documentation": "

Amazon Resource Number (ARN) of the report generator.

" + "smithy.api#documentation": "

Amazon Resource Name (ARN) of the report generator.

" } }, "LastRunStatus": { @@ -5473,7 +5846,7 @@ "ReportCreatorAccount": { "target": "com.amazonaws.licensemanager#String", "traits": { - "smithy.api#documentation": "

The AWS account ID used to create the report generator.

" + "smithy.api#documentation": "

The Amazon Web Services account ID used to create the report generator.

" } }, "Description": { @@ -6073,7 +6446,7 @@ } ], "traits": { - "smithy.api#documentation": "

Updates a report generator.

\n

After you make changes to a report generator, it will start generating new reports within 60 minutes of being updated.

" + "smithy.api#documentation": "

Updates a report generator.

\n

After you make changes to a report generator, it starts generating new reports within 60 minutes of being updated.

" } }, "com.amazonaws.licensemanager#UpdateLicenseManagerReportGeneratorRequest": { @@ -6082,7 +6455,7 @@ "LicenseManagerReportGeneratorArn": { "target": "com.amazonaws.licensemanager#String", "traits": { - "smithy.api#documentation": "

Amazon Resource Number (ARN) of the report generator to update.

", + "smithy.api#documentation": "

Amazon Resource Name (ARN) of the report generator to update.

", "smithy.api#required": {} } }, @@ -6096,21 +6469,21 @@ "Type": { "target": "com.amazonaws.licensemanager#ReportTypeList", "traits": { - "smithy.api#documentation": "

Type of reports to generate. The following report types an be generated:

\n ", + "smithy.api#documentation": "

Type of reports to generate. The following report types are supported:

\n ", "smithy.api#required": {} } }, "ReportContext": { "target": "com.amazonaws.licensemanager#ReportContext", "traits": { - "smithy.api#documentation": "

?

", + "smithy.api#documentation": "

The report context.

", "smithy.api#required": {} } }, "ReportFrequency": { "target": "com.amazonaws.licensemanager#ReportFrequency", "traits": { - "smithy.api#documentation": "

Frequency by which reports are generated. The following options are avaiable:

\n

??? What are the APi value options?

", + "smithy.api#documentation": "

Frequency by which reports are generated.

", "smithy.api#required": {} } }, @@ -6165,7 +6538,7 @@ } ], "traits": { - "smithy.api#documentation": "

Adds or removes the specified license configurations for the specified AWS resource.

\n

You can update the license specifications of AMIs, instances, and hosts.\n You cannot update the license specifications for launch templates and AWS CloudFormation templates, \n as they send license configurations to the operation that creates the resource.

" + "smithy.api#documentation": "

Adds or removes the specified license configurations for the specified Amazon Web Services resource.

\n

You can update the license specifications of AMIs, instances, and hosts.\n You cannot update the license specifications for launch templates and CloudFormation templates, \n as they send license configurations to the operation that creates the resource.

" } }, "com.amazonaws.licensemanager#UpdateLicenseSpecificationsForResourceRequest": { @@ -6174,7 +6547,7 @@ "ResourceArn": { "target": "com.amazonaws.licensemanager#String", "traits": { - "smithy.api#documentation": "

Amazon Resource Name (ARN) of the AWS resource.

", + "smithy.api#documentation": "

Amazon Resource Name (ARN) of the Amazon Web Services resource.

", "smithy.api#required": {} } }, @@ -6243,7 +6616,7 @@ "OrganizationConfiguration": { "target": "com.amazonaws.licensemanager#OrganizationConfiguration", "traits": { - "smithy.api#documentation": "

Enables integration with AWS Organizations for cross-account discovery.

" + "smithy.api#documentation": "

Enables integration with Organizations for cross-account discovery.

" } }, "EnableCrossAccountsDiscovery": { @@ -6258,6 +6631,15 @@ "type": "structure", "members": {} }, + "com.amazonaws.licensemanager#UsageOperation": { + "type": "string", + "traits": { + "smithy.api#length": { + "min": 0, + "max": 50 + } + } + }, "com.amazonaws.licensemanager#ValidationException": { "type": "structure", "members": { diff --git a/codegen/sdk-codegen/aws-models/mediaconvert.2017-08-29.json b/codegen/sdk-codegen/aws-models/mediaconvert.2017-08-29.json index c62560c8de1..f4dc0df43b9 100644 --- a/codegen/sdk-codegen/aws-models/mediaconvert.2017-08-29.json +++ b/codegen/sdk-codegen/aws-models/mediaconvert.2017-08-29.json @@ -1899,6 +1899,22 @@ ] } }, + "com.amazonaws.mediaconvert#BurnInSubtitleStylePassthrough": { + "type": "string", + "traits": { + "smithy.api#documentation": "Ignore this setting unless your output captions are burned in. Choose which set of style and position values the service applies to your output captions. When you choose ENABLED, the service uses the input style and position information from your input. When you choose DISABLED, the service uses any style values that you specify in your output settings. If you don't specify values, the service uses default style and position values. When you choose DISABLED, the service ignores all style and position values from your input.", + "smithy.api#enum": [ + { + "value": "ENABLED", + "name": "ENABLED" + }, + { + "value": "DISABLED", + "name": "DISABLED" + } + ] + } + }, "com.amazonaws.mediaconvert#BurninDestinationSettings": { "type": "structure", "members": { @@ -1909,6 +1925,13 @@ "smithy.api#jsonName": "alignment" } }, + "ApplyFontColor": { + "target": "com.amazonaws.mediaconvert#BurninSubtitleApplyFontColor", + "traits": { + "smithy.api#documentation": "Ignore this setting unless your input captions are STL, any type of 608, teletext, or TTML, and your output captions are burned in. Specify how the service applies the color specified in the setting Font color (BurninSubtitleFontColor). By default, this color is white. When you choose WHITE_TEXT_ONLY, the service uses the specified font color only for text that is white in the input. When you choose ALL_TEXT, the service uses the specified font color for all output captions text. If you leave both settings at their default value, your output font color is the same as your input font color.", + "smithy.api#jsonName": "applyFontColor" + } + }, "BackgroundColor": { "target": "com.amazonaws.mediaconvert#BurninSubtitleBackgroundColor", "traits": { @@ -1923,6 +1946,13 @@ "smithy.api#jsonName": "backgroundOpacity" } }, + "FallbackFont": { + "target": "com.amazonaws.mediaconvert#BurninSubtitleFallbackFont", + "traits": { + "smithy.api#documentation": "Specify the font that you want the service to use for your burn in captions when your input captions specify a font that MediaConvert doesn't support. When you keep the default value, Best match (BEST_MATCH), MediaConvert uses a supported font that most closely matches the font that your input captions specify. When there are multiple unsupported fonts in your input captions, MediaConvert matches each font with the supported font that matches best. When you explicitly choose a replacement font, MediaConvert uses that font to replace all unsupported fonts from your input.", + "smithy.api#jsonName": "fallbackFont" + } + }, "FontColor": { "target": "com.amazonaws.mediaconvert#BurninSubtitleFontColor", "traits": { @@ -1958,6 +1988,13 @@ "smithy.api#jsonName": "fontSize" } }, + "HexFontColor": { + "target": "com.amazonaws.mediaconvert#__stringMin6Max8Pattern09aFAF609aFAF2", + "traits": { + "smithy.api#documentation": "Ignore this setting unless your BurninSubtitleFontColor setting is HEX. Format is six or eight hexidecimal digits, representing the red, green, and blue components, with the two extra digits used for an optional alpha value. For example a value of 1122AABB is a red value of 0x11, a green value of 0x22, a blue value of 0xAA, and an alpha value of 0xBB.", + "smithy.api#jsonName": "hexFontColor" + } + }, "OutlineColor": { "target": "com.amazonaws.mediaconvert#BurninSubtitleOutlineColor", "traits": { @@ -2000,6 +2037,13 @@ "smithy.api#jsonName": "shadowYOffset" } }, + "StylePassthrough": { + "target": "com.amazonaws.mediaconvert#BurnInSubtitleStylePassthrough", + "traits": { + "smithy.api#documentation": "Ignore this setting unless your output captions are burned in. Choose which set of style and position values the service applies to your output captions. When you choose ENABLED, the service uses the input style and position information from your input. When you choose DISABLED, the service uses any style values that you specify in your output settings. If you don't specify values, the service uses default style and position values. When you choose DISABLED, the service ignores all style and position values from your input.", + "smithy.api#jsonName": "stylePassthrough" + } + }, "TeletextSpacing": { "target": "com.amazonaws.mediaconvert#BurninSubtitleTeletextSpacing", "traits": { @@ -2038,6 +2082,26 @@ { "value": "LEFT", "name": "LEFT" + }, + { + "value": "AUTO", + "name": "AUTO" + } + ] + } + }, + "com.amazonaws.mediaconvert#BurninSubtitleApplyFontColor": { + "type": "string", + "traits": { + "smithy.api#documentation": "Ignore this setting unless your input captions are STL, any type of 608, teletext, or TTML, and your output captions are burned in. Specify how the service applies the color specified in the setting Font color (BurninSubtitleFontColor). By default, this color is white. When you choose WHITE_TEXT_ONLY, the service uses the specified font color only for text that is white in the input. When you choose ALL_TEXT, the service uses the specified font color for all output captions text. If you leave both settings at their default value, your output font color is the same as your input font color.", + "smithy.api#enum": [ + { + "value": "WHITE_TEXT_ONLY", + "name": "WHITE_TEXT_ONLY" + }, + { + "value": "ALL_TEXT", + "name": "ALL_TEXT" } ] } @@ -2058,6 +2122,38 @@ { "value": "WHITE", "name": "WHITE" + }, + { + "value": "AUTO", + "name": "AUTO" + } + ] + } + }, + "com.amazonaws.mediaconvert#BurninSubtitleFallbackFont": { + "type": "string", + "traits": { + "smithy.api#documentation": "Specify the font that you want the service to use for your burn in captions when your input captions specify a font that MediaConvert doesn't support. When you keep the default value, Best match (BEST_MATCH), MediaConvert uses a supported font that most closely matches the font that your input captions specify. When there are multiple unsupported fonts in your input captions, MediaConvert matches each font with the supported font that matches best. When you explicitly choose a replacement font, MediaConvert uses that font to replace all unsupported fonts from your input.", + "smithy.api#enum": [ + { + "value": "BEST_MATCH", + "name": "BEST_MATCH" + }, + { + "value": "MONOSPACED_SANSSERIF", + "name": "MONOSPACED_SANSSERIF" + }, + { + "value": "MONOSPACED_SERIF", + "name": "MONOSPACED_SERIF" + }, + { + "value": "PROPORTIONAL_SANSSERIF", + "name": "PROPORTIONAL_SANSSERIF" + }, + { + "value": "PROPORTIONAL_SERIF", + "name": "PROPORTIONAL_SERIF" } ] } @@ -2090,6 +2186,14 @@ { "value": "BLUE", "name": "BLUE" + }, + { + "value": "HEX", + "name": "HEX" + }, + { + "value": "AUTO", + "name": "AUTO" } ] } @@ -2122,6 +2226,10 @@ { "value": "BLUE", "name": "BLUE" + }, + { + "value": "AUTO", + "name": "AUTO" } ] } @@ -2142,6 +2250,10 @@ { "value": "WHITE", "name": "WHITE" + }, + { + "value": "AUTO", + "name": "AUTO" } ] } @@ -2158,6 +2270,10 @@ { "value": "PROPORTIONAL", "name": "PROPORTIONAL" + }, + { + "value": "AUTO", + "name": "AUTO" } ] } @@ -2809,6 +2925,13 @@ "smithy.api#jsonName": "imageBasedTrickPlay" } }, + "ImageBasedTrickPlaySettings": { + "target": "com.amazonaws.mediaconvert#CmafImageBasedTrickPlaySettings", + "traits": { + "smithy.api#documentation": "Tile and thumbnail settings applicable when imageBasedTrickPlay is ADVANCED", + "smithy.api#jsonName": "imageBasedTrickPlaySettings" + } + }, "ManifestCompression": { "target": "com.amazonaws.mediaconvert#CmafManifestCompression", "traits": { @@ -2928,10 +3051,64 @@ { "value": "THUMBNAIL_AND_FULLFRAME", "name": "THUMBNAIL_AND_FULLFRAME" + }, + { + "value": "ADVANCED", + "name": "ADVANCED" } ] } }, + "com.amazonaws.mediaconvert#CmafImageBasedTrickPlaySettings": { + "type": "structure", + "members": { + "IntervalCadence": { + "target": "com.amazonaws.mediaconvert#CmafIntervalCadence", + "traits": { + "smithy.api#documentation": "The cadence MediaConvert follows for generating thumbnails. If set to FOLLOW_IFRAME, MediaConvert generates thumbnails for each IDR frame in the output (matching the GOP cadence). If set to FOLLOW_CUSTOM, MediaConvert generates thumbnails according to the interval you specify in thumbnailInterval.", + "smithy.api#jsonName": "intervalCadence" + } + }, + "ThumbnailHeight": { + "target": "com.amazonaws.mediaconvert#__integerMin2Max4096", + "traits": { + "smithy.api#documentation": "Height of each thumbnail within each tile image, in pixels. Leave blank to maintain aspect ratio with thumbnail width. If following the aspect ratio would lead to a total tile height greater than 4096, then the job will be rejected. Must be divisible by 2.", + "smithy.api#jsonName": "thumbnailHeight" + } + }, + "ThumbnailInterval": { + "target": "com.amazonaws.mediaconvert#__doubleMin0Max2147483647", + "traits": { + "smithy.api#documentation": "Enter the interval, in seconds, that MediaConvert uses to generate thumbnails. If the interval you enter doesn't align with the output frame rate, MediaConvert automatically rounds the interval to align with the output frame rate. For example, if the output frame rate is 29.97 frames per second and you enter 5, MediaConvert uses a 150 frame interval to generate thumbnails.", + "smithy.api#jsonName": "thumbnailInterval" + } + }, + "ThumbnailWidth": { + "target": "com.amazonaws.mediaconvert#__integerMin8Max4096", + "traits": { + "smithy.api#documentation": "Width of each thumbnail within each tile image, in pixels. Default is 312. Must be divisible by 8.", + "smithy.api#jsonName": "thumbnailWidth" + } + }, + "TileHeight": { + "target": "com.amazonaws.mediaconvert#__integerMin1Max2048", + "traits": { + "smithy.api#documentation": "Number of thumbnails in each column of a tile image. Set a value between 2 and 2048. Must be divisible by 2.", + "smithy.api#jsonName": "tileHeight" + } + }, + "TileWidth": { + "target": "com.amazonaws.mediaconvert#__integerMin1Max512", + "traits": { + "smithy.api#documentation": "Number of thumbnails in each row of a tile image. Set a value between 1 and 512.", + "smithy.api#jsonName": "tileWidth" + } + } + }, + "traits": { + "smithy.api#documentation": "Tile and thumbnail settings applicable when imageBasedTrickPlay is ADVANCED" + } + }, "com.amazonaws.mediaconvert#CmafInitializationVectorInManifest": { "type": "string", "traits": { @@ -2948,6 +3125,22 @@ ] } }, + "com.amazonaws.mediaconvert#CmafIntervalCadence": { + "type": "string", + "traits": { + "smithy.api#documentation": "The cadence MediaConvert follows for generating thumbnails. If set to FOLLOW_IFRAME, MediaConvert generates thumbnails for each IDR frame in the output (matching the GOP cadence). If set to FOLLOW_CUSTOM, MediaConvert generates thumbnails according to the interval you specify in thumbnailInterval.", + "smithy.api#enum": [ + { + "value": "FOLLOW_IFRAME", + "name": "FOLLOW_IFRAME" + }, + { + "value": "FOLLOW_CUSTOM", + "name": "FOLLOW_CUSTOM" + } + ] + } + }, "com.amazonaws.mediaconvert#CmafKeyProviderType": { "type": "string", "traits": { @@ -4204,6 +4397,13 @@ "smithy.api#jsonName": "imageBasedTrickPlay" } }, + "ImageBasedTrickPlaySettings": { + "target": "com.amazonaws.mediaconvert#DashIsoImageBasedTrickPlaySettings", + "traits": { + "smithy.api#documentation": "Tile and thumbnail settings applicable when imageBasedTrickPlay is ADVANCED", + "smithy.api#jsonName": "imageBasedTrickPlaySettings" + } + }, "MinBufferTime": { "target": "com.amazonaws.mediaconvert#__integerMin0Max2147483647", "traits": { @@ -4297,6 +4497,76 @@ { "value": "THUMBNAIL_AND_FULLFRAME", "name": "THUMBNAIL_AND_FULLFRAME" + }, + { + "value": "ADVANCED", + "name": "ADVANCED" + } + ] + } + }, + "com.amazonaws.mediaconvert#DashIsoImageBasedTrickPlaySettings": { + "type": "structure", + "members": { + "IntervalCadence": { + "target": "com.amazonaws.mediaconvert#DashIsoIntervalCadence", + "traits": { + "smithy.api#documentation": "The cadence MediaConvert follows for generating thumbnails. If set to FOLLOW_IFRAME, MediaConvert generates thumbnails for each IDR frame in the output (matching the GOP cadence). If set to FOLLOW_CUSTOM, MediaConvert generates thumbnails according to the interval you specify in thumbnailInterval.", + "smithy.api#jsonName": "intervalCadence" + } + }, + "ThumbnailHeight": { + "target": "com.amazonaws.mediaconvert#__integerMin1Max4096", + "traits": { + "smithy.api#documentation": "Height of each thumbnail within each tile image, in pixels. Leave blank to maintain aspect ratio with thumbnail width. If following the aspect ratio would lead to a total tile height greater than 4096, then the job will be rejected. Must be divisible by 2.", + "smithy.api#jsonName": "thumbnailHeight" + } + }, + "ThumbnailInterval": { + "target": "com.amazonaws.mediaconvert#__doubleMin0Max2147483647", + "traits": { + "smithy.api#documentation": "Enter the interval, in seconds, that MediaConvert uses to generate thumbnails. If the interval you enter doesn't align with the output frame rate, MediaConvert automatically rounds the interval to align with the output frame rate. For example, if the output frame rate is 29.97 frames per second and you enter 5, MediaConvert uses a 150 frame interval to generate thumbnails.", + "smithy.api#jsonName": "thumbnailInterval" + } + }, + "ThumbnailWidth": { + "target": "com.amazonaws.mediaconvert#__integerMin8Max4096", + "traits": { + "smithy.api#documentation": "Width of each thumbnail within each tile image, in pixels. Default is 312. Must be divisible by 8.", + "smithy.api#jsonName": "thumbnailWidth" + } + }, + "TileHeight": { + "target": "com.amazonaws.mediaconvert#__integerMin1Max2048", + "traits": { + "smithy.api#documentation": "Number of thumbnails in each column of a tile image. Set a value between 2 and 2048. Must be divisible by 2.", + "smithy.api#jsonName": "tileHeight" + } + }, + "TileWidth": { + "target": "com.amazonaws.mediaconvert#__integerMin1Max512", + "traits": { + "smithy.api#documentation": "Number of thumbnails in each row of a tile image. Set a value between 1 and 512.", + "smithy.api#jsonName": "tileWidth" + } + } + }, + "traits": { + "smithy.api#documentation": "Tile and thumbnail settings applicable when imageBasedTrickPlay is ADVANCED" + } + }, + "com.amazonaws.mediaconvert#DashIsoIntervalCadence": { + "type": "string", + "traits": { + "smithy.api#documentation": "The cadence MediaConvert follows for generating thumbnails. If set to FOLLOW_IFRAME, MediaConvert generates thumbnails for each IDR frame in the output (matching the GOP cadence). If set to FOLLOW_CUSTOM, MediaConvert generates thumbnails according to the interval you specify in thumbnailInterval.", + "smithy.api#enum": [ + { + "value": "FOLLOW_IFRAME", + "name": "FOLLOW_IFRAME" + }, + { + "value": "FOLLOW_CUSTOM", + "name": "FOLLOW_CUSTOM" } ] } @@ -5018,6 +5288,13 @@ "smithy.api#jsonName": "alignment" } }, + "ApplyFontColor": { + "target": "com.amazonaws.mediaconvert#DvbSubtitleApplyFontColor", + "traits": { + "smithy.api#documentation": "Ignore this setting unless your input captions are STL, any type of 608, teletext, or TTML, and your output captions are DVB-SUB. Specify how the service applies the color specified in the setting Font color (DvbSubtitleFontColor). By default, this color is white. When you choose WHITE_TEXT_ONLY, the service uses the specified font color only for text that is white in the input. When you choose ALL_TEXT, the service uses the specified font color for all output captions text. If you leave both settings at their default value, your output font color is the same as your input font color.", + "smithy.api#jsonName": "applyFontColor" + } + }, "BackgroundColor": { "target": "com.amazonaws.mediaconvert#DvbSubtitleBackgroundColor", "traits": { @@ -5053,6 +5330,13 @@ "smithy.api#jsonName": "ddsYCoordinate" } }, + "FallbackFont": { + "target": "com.amazonaws.mediaconvert#DvbSubSubtitleFallbackFont", + "traits": { + "smithy.api#documentation": "Specify the font that you want the service to use for your burn in captions when your input captions specify a font that MediaConvert doesn't support. When you keep the default value, Best match (BEST_MATCH), MediaConvert uses a supported font that most closely matches the font that your input captions specify. When there are multiple unsupported fonts in your input captions, MediaConvert matches each font with the supported font that matches best. When you explicitly choose a replacement font, MediaConvert uses that font to replace all unsupported fonts from your input.", + "smithy.api#jsonName": "fallbackFont" + } + }, "FontColor": { "target": "com.amazonaws.mediaconvert#DvbSubtitleFontColor", "traits": { @@ -5095,6 +5379,13 @@ "smithy.api#jsonName": "height" } }, + "HexFontColor": { + "target": "com.amazonaws.mediaconvert#__stringMin6Max8Pattern09aFAF609aFAF2", + "traits": { + "smithy.api#documentation": "Ignore this setting unless your DvbSubtitleFontColor setting is HEX. Format is six or eight hexidecimal digits, representing the red, green, and blue components, with the two extra digits used for an optional alpha value. For example a value of 1122AABB is a red value of 0x11, a green value of 0x22, a blue value of 0xAA, and an alpha value of 0xBB.", + "smithy.api#jsonName": "hexFontColor" + } + }, "OutlineColor": { "target": "com.amazonaws.mediaconvert#DvbSubtitleOutlineColor", "traits": { @@ -5137,6 +5428,13 @@ "smithy.api#jsonName": "shadowYOffset" } }, + "StylePassthrough": { + "target": "com.amazonaws.mediaconvert#DvbSubtitleStylePassthrough", + "traits": { + "smithy.api#documentation": "Choose which set of style and position values the service applies to your output captions. When you choose ENABLED, the service uses the input style and position information from your input. When you choose DISABLED, the service uses any style values that you specify in your output settings. If you don't specify values, the service uses default style and position values. When you choose DISABLED, the service ignores all style and position values from your input.", + "smithy.api#jsonName": "stylePassthrough" + } + }, "SubtitlingType": { "target": "com.amazonaws.mediaconvert#DvbSubtitlingType", "traits": { @@ -5192,6 +5490,34 @@ "smithy.api#documentation": "DVB Sub Source Settings" } }, + "com.amazonaws.mediaconvert#DvbSubSubtitleFallbackFont": { + "type": "string", + "traits": { + "smithy.api#documentation": "Specify the font that you want the service to use for your burn in captions when your input captions specify a font that MediaConvert doesn't support. When you keep the default value, Best match (BEST_MATCH), MediaConvert uses a supported font that most closely matches the font that your input captions specify. When there are multiple unsupported fonts in your input captions, MediaConvert matches each font with the supported font that matches best. When you explicitly choose a replacement font, MediaConvert uses that font to replace all unsupported fonts from your input.", + "smithy.api#enum": [ + { + "value": "BEST_MATCH", + "name": "BEST_MATCH" + }, + { + "value": "MONOSPACED_SANSSERIF", + "name": "MONOSPACED_SANSSERIF" + }, + { + "value": "MONOSPACED_SERIF", + "name": "MONOSPACED_SERIF" + }, + { + "value": "PROPORTIONAL_SANSSERIF", + "name": "PROPORTIONAL_SANSSERIF" + }, + { + "value": "PROPORTIONAL_SERIF", + "name": "PROPORTIONAL_SERIF" + } + ] + } + }, "com.amazonaws.mediaconvert#DvbSubtitleAlignment": { "type": "string", "traits": { @@ -5204,6 +5530,26 @@ { "value": "LEFT", "name": "LEFT" + }, + { + "value": "AUTO", + "name": "AUTO" + } + ] + } + }, + "com.amazonaws.mediaconvert#DvbSubtitleApplyFontColor": { + "type": "string", + "traits": { + "smithy.api#documentation": "Ignore this setting unless your input captions are STL, any type of 608, teletext, or TTML, and your output captions are DVB-SUB. Specify how the service applies the color specified in the setting Font color (DvbSubtitleFontColor). By default, this color is white. When you choose WHITE_TEXT_ONLY, the service uses the specified font color only for text that is white in the input. When you choose ALL_TEXT, the service uses the specified font color for all output captions text. If you leave both settings at their default value, your output font color is the same as your input font color.", + "smithy.api#enum": [ + { + "value": "WHITE_TEXT_ONLY", + "name": "WHITE_TEXT_ONLY" + }, + { + "value": "ALL_TEXT", + "name": "ALL_TEXT" } ] } @@ -5224,6 +5570,10 @@ { "value": "WHITE", "name": "WHITE" + }, + { + "value": "AUTO", + "name": "AUTO" } ] } @@ -5256,6 +5606,14 @@ { "value": "BLUE", "name": "BLUE" + }, + { + "value": "HEX", + "name": "HEX" + }, + { + "value": "AUTO", + "name": "AUTO" } ] } @@ -5288,6 +5646,10 @@ { "value": "BLUE", "name": "BLUE" + }, + { + "value": "AUTO", + "name": "AUTO" } ] } @@ -5308,6 +5670,26 @@ { "value": "WHITE", "name": "WHITE" + }, + { + "value": "AUTO", + "name": "AUTO" + } + ] + } + }, + "com.amazonaws.mediaconvert#DvbSubtitleStylePassthrough": { + "type": "string", + "traits": { + "smithy.api#documentation": "Choose which set of style and position values the service applies to your output captions. When you choose ENABLED, the service uses the input style and position information from your input. When you choose DISABLED, the service uses any style values that you specify in your output settings. If you don't specify values, the service uses default style and position values. When you choose DISABLED, the service ignores all style and position values from your input.", + "smithy.api#enum": [ + { + "value": "ENABLED", + "name": "ENABLED" + }, + { + "value": "DISABLED", + "name": "DISABLED" } ] } @@ -5324,6 +5706,10 @@ { "value": "PROPORTIONAL", "name": "PROPORTIONAL" + }, + { + "value": "AUTO", + "name": "AUTO" } ] } @@ -6352,7 +6738,7 @@ } }, "traits": { - "smithy.api#documentation": "Hexadecimal value as per EIA-608 Line 21 Data Services, section 9.5.1.5 05h Content Advisory." + "smithy.api#documentation": "If your source content has EIA-608 Line 21 Data Services, enable this feature to specify what MediaConvert does with the Extended Data Services (XDS) packets. You can choose to pass through XDS packets, or remove them from the output. For more information about XDS, see EIA-608 Line Data Services, section 9.5.1.5 05h Content Advisory." } }, "com.amazonaws.mediaconvert#F4vMoovPlacement": { @@ -8948,6 +9334,13 @@ "smithy.api#jsonName": "imageBasedTrickPlay" } }, + "ImageBasedTrickPlaySettings": { + "target": "com.amazonaws.mediaconvert#HlsImageBasedTrickPlaySettings", + "traits": { + "smithy.api#documentation": "Tile and thumbnail settings applicable when imageBasedTrickPlay is ADVANCED", + "smithy.api#jsonName": "imageBasedTrickPlaySettings" + } + }, "ManifestCompression": { "target": "com.amazonaws.mediaconvert#HlsManifestCompression", "traits": { @@ -9097,10 +9490,64 @@ { "value": "THUMBNAIL_AND_FULLFRAME", "name": "THUMBNAIL_AND_FULLFRAME" + }, + { + "value": "ADVANCED", + "name": "ADVANCED" } ] } }, + "com.amazonaws.mediaconvert#HlsImageBasedTrickPlaySettings": { + "type": "structure", + "members": { + "IntervalCadence": { + "target": "com.amazonaws.mediaconvert#HlsIntervalCadence", + "traits": { + "smithy.api#documentation": "The cadence MediaConvert follows for generating thumbnails. If set to FOLLOW_IFRAME, MediaConvert generates thumbnails for each IDR frame in the output (matching the GOP cadence). If set to FOLLOW_CUSTOM, MediaConvert generates thumbnails according to the interval you specify in thumbnailInterval.", + "smithy.api#jsonName": "intervalCadence" + } + }, + "ThumbnailHeight": { + "target": "com.amazonaws.mediaconvert#__integerMin2Max4096", + "traits": { + "smithy.api#documentation": "Height of each thumbnail within each tile image, in pixels. Leave blank to maintain aspect ratio with thumbnail width. If following the aspect ratio would lead to a total tile height greater than 4096, then the job will be rejected. Must be divisible by 2.", + "smithy.api#jsonName": "thumbnailHeight" + } + }, + "ThumbnailInterval": { + "target": "com.amazonaws.mediaconvert#__doubleMin0Max2147483647", + "traits": { + "smithy.api#documentation": "Enter the interval, in seconds, that MediaConvert uses to generate thumbnails. If the interval you enter doesn't align with the output frame rate, MediaConvert automatically rounds the interval to align with the output frame rate. For example, if the output frame rate is 29.97 frames per second and you enter 5, MediaConvert uses a 150 frame interval to generate thumbnails.", + "smithy.api#jsonName": "thumbnailInterval" + } + }, + "ThumbnailWidth": { + "target": "com.amazonaws.mediaconvert#__integerMin8Max4096", + "traits": { + "smithy.api#documentation": "Width of each thumbnail within each tile image, in pixels. Default is 312. Must be divisible by 8.", + "smithy.api#jsonName": "thumbnailWidth" + } + }, + "TileHeight": { + "target": "com.amazonaws.mediaconvert#__integerMin1Max2048", + "traits": { + "smithy.api#documentation": "Number of thumbnails in each column of a tile image. Set a value between 2 and 2048. Must be divisible by 2.", + "smithy.api#jsonName": "tileHeight" + } + }, + "TileWidth": { + "target": "com.amazonaws.mediaconvert#__integerMin1Max512", + "traits": { + "smithy.api#documentation": "Number of thumbnails in each row of a tile image. Set a value between 1 and 512.", + "smithy.api#jsonName": "tileWidth" + } + } + }, + "traits": { + "smithy.api#documentation": "Tile and thumbnail settings applicable when imageBasedTrickPlay is ADVANCED" + } + }, "com.amazonaws.mediaconvert#HlsInitializationVectorInManifest": { "type": "string", "traits": { @@ -9117,6 +9564,22 @@ ] } }, + "com.amazonaws.mediaconvert#HlsIntervalCadence": { + "type": "string", + "traits": { + "smithy.api#documentation": "The cadence MediaConvert follows for generating thumbnails. If set to FOLLOW_IFRAME, MediaConvert generates thumbnails for each IDR frame in the output (matching the GOP cadence). If set to FOLLOW_CUSTOM, MediaConvert generates thumbnails according to the interval you specify in thumbnailInterval.", + "smithy.api#enum": [ + { + "value": "FOLLOW_IFRAME", + "name": "FOLLOW_IFRAME" + }, + { + "value": "FOLLOW_CUSTOM", + "name": "FOLLOW_CUSTOM" + } + ] + } + }, "com.amazonaws.mediaconvert#HlsKeyProviderType": { "type": "string", "traits": { @@ -10320,7 +10783,7 @@ "ExtendedDataServices": { "target": "com.amazonaws.mediaconvert#ExtendedDataServices", "traits": { - "smithy.api#documentation": "Hexadecimal value as per EIA-608 Line 21 Data Services, section 9.5.1.5 05h Content Advisory.", + "smithy.api#documentation": "If your source content has EIA-608 Line 21 Data Services, enable this feature to specify what MediaConvert does with the Extended Data Services (XDS) packets. You can choose to pass through XDS packets, or remove them from the output. For more information about XDS, see EIA-608 Line Data Services, section 9.5.1.5 05h Content Advisory.", "smithy.api#jsonName": "extendedDataServices" } }, @@ -10561,7 +11024,7 @@ "ExtendedDataServices": { "target": "com.amazonaws.mediaconvert#ExtendedDataServices", "traits": { - "smithy.api#documentation": "Hexadecimal value as per EIA-608 Line 21 Data Services, section 9.5.1.5 05h Content Advisory.", + "smithy.api#documentation": "If your source content has EIA-608 Line 21 Data Services, enable this feature to specify what MediaConvert does with the Extended Data Services (XDS) packets. You can choose to pass through XDS packets, or remove them from the output. For more information about XDS, see EIA-608 Line Data Services, section 9.5.1.5 05h Content Advisory.", "smithy.api#jsonName": "extendedDataServices" } }, @@ -19193,6 +19656,15 @@ } } }, + "com.amazonaws.mediaconvert#__integerMin1Max2048": { + "type": "integer", + "traits": { + "smithy.api#range": { + "min": 1, + "max": 2048 + } + } + }, "com.amazonaws.mediaconvert#__integerMin1Max2147483640": { "type": "integer", "traits": { @@ -19238,6 +19710,24 @@ } } }, + "com.amazonaws.mediaconvert#__integerMin1Max4096": { + "type": "integer", + "traits": { + "smithy.api#range": { + "min": 1, + "max": 4096 + } + } + }, + "com.amazonaws.mediaconvert#__integerMin1Max512": { + "type": "integer", + "traits": { + "smithy.api#range": { + "min": 1, + "max": 512 + } + } + }, "com.amazonaws.mediaconvert#__integerMin1Max6": { "type": "integer", "traits": { @@ -19310,6 +19800,15 @@ } } }, + "com.amazonaws.mediaconvert#__integerMin2Max4096": { + "type": "integer", + "traits": { + "smithy.api#range": { + "min": 2, + "max": 4096 + } + } + }, "com.amazonaws.mediaconvert#__integerMin32000Max192000": { "type": "integer", "traits": { @@ -19436,6 +19935,15 @@ } } }, + "com.amazonaws.mediaconvert#__integerMin8Max4096": { + "type": "integer", + "traits": { + "smithy.api#range": { + "min": 8, + "max": 4096 + } + } + }, "com.amazonaws.mediaconvert#__integerMin96Max600": { "type": "integer", "traits": { @@ -19968,6 +20476,16 @@ "smithy.api#pattern": "^[A-Za-z]{3}$" } }, + "com.amazonaws.mediaconvert#__stringMin6Max8Pattern09aFAF609aFAF2": { + "type": "string", + "traits": { + "smithy.api#length": { + "min": 6, + "max": 8 + }, + "smithy.api#pattern": "^[0-9a-fA-F]{6}([0-9a-fA-F]{2})?$" + } + }, "com.amazonaws.mediaconvert#__stringMin9Max19PatternAZ26EastWestCentralNorthSouthEastWest1912": { "type": "string", "traits": { diff --git a/codegen/sdk-codegen/aws-models/mediapackagevod.2018-11-07.json b/codegen/sdk-codegen/aws-models/mediapackagevod.2018-11-07.json index 971c2678089..96f5ea58a79 100644 --- a/codegen/sdk-codegen/aws-models/mediapackagevod.2018-11-07.json +++ b/codegen/sdk-codegen/aws-models/mediapackagevod.2018-11-07.json @@ -1326,6 +1326,13 @@ "smithy.api#jsonName": "packagingConfigurationId" } }, + "Status": { + "target": "com.amazonaws.mediapackagevod#__string", + "traits": { + "smithy.api#documentation": "The current processing status of the asset used for the packaging configuration. The status can be either QUEUED, PROCESSING, PLAYABLE, or FAILED. Status information won't be available for most assets ingested before 2021-09-30.", + "smithy.api#jsonName": "status" + } + }, "Url": { "target": "com.amazonaws.mediapackagevod#__string", "traits": { diff --git a/codegen/sdk-codegen/aws-models/mediatailor.2018-04-23.json b/codegen/sdk-codegen/aws-models/mediatailor.2018-04-23.json index da17d9db34a..20adafc3665 100644 --- a/codegen/sdk-codegen/aws-models/mediatailor.2018-04-23.json +++ b/codegen/sdk-codegen/aws-models/mediatailor.2018-04-23.json @@ -345,6 +345,62 @@ "smithy.api#documentation": "

The predefined aliases for dynamic variables.

" } }, + "com.amazonaws.mediatailor#ConfigureLogsForPlaybackConfiguration": { + "type": "operation", + "input": { + "target": "com.amazonaws.mediatailor#ConfigureLogsForPlaybackConfigurationRequest" + }, + "output": { + "target": "com.amazonaws.mediatailor#ConfigureLogsForPlaybackConfigurationResponse" + }, + "traits": { + "smithy.api#documentation": "

Configures Amazon CloudWatch log settings for a playback configuration.

", + "smithy.api#http": { + "method": "PUT", + "uri": "/configureLogs/playbackConfiguration", + "code": 200 + } + } + }, + "com.amazonaws.mediatailor#ConfigureLogsForPlaybackConfigurationRequest": { + "type": "structure", + "members": { + "PercentEnabled": { + "target": "com.amazonaws.mediatailor#__integer", + "traits": { + "smithy.api#documentation": "

The percentage of session logs that MediaTailor sends to your Cloudwatch Logs account. For example, if your playback configuration has 1000 sessions and percentEnabled is set to 60, MediaTailor sends logs for 600 of the sessions to CloudWatch Logs. MediaTailor decides at random which of the playback configuration sessions to send logs for. If you want to view logs for a specific session, you can use the debug log mode.

Valid values: 0 - 100

", + "smithy.api#required": {} + } + }, + "PlaybackConfigurationName": { + "target": "com.amazonaws.mediatailor#__string", + "traits": { + "smithy.api#documentation": "

The name of the playback configuration.

", + "smithy.api#required": {} + } + } + }, + "traits": { + "smithy.api#documentation": "

Configures Amazon CloudWatch log settings for a playback configuration.

" + } + }, + "com.amazonaws.mediatailor#ConfigureLogsForPlaybackConfigurationResponse": { + "type": "structure", + "members": { + "PercentEnabled": { + "target": "com.amazonaws.mediatailor#__integer", + "traits": { + "smithy.api#documentation": "

The percentage of session logs that MediaTailor sends to your Cloudwatch Logs account.

" + } + }, + "PlaybackConfigurationName": { + "target": "com.amazonaws.mediatailor#__string", + "traits": { + "smithy.api#documentation": "

The name of the playback configuration.

" + } + } + } + }, "com.amazonaws.mediatailor#CreateChannel": { "type": "operation", "input": { @@ -376,7 +432,7 @@ "FillerSlate": { "target": "com.amazonaws.mediatailor#SlateSource", "traits": { - "smithy.api#documentation": "

The slate used to fill gaps between programs in the schedule. You must configure filler slate if your channel uses an LINEAR PlaybackMode.

" + "smithy.api#documentation": "

The slate used to fill gaps between programs in the schedule. You must configure filler slate if your channel uses a LINEAR PlaybackMode.

" } }, "Outputs": { @@ -1649,6 +1705,12 @@ "smithy.api#documentation": "

The configuration for pre-roll ad insertion.

" } }, + "LogConfiguration": { + "target": "com.amazonaws.mediatailor#LogConfiguration", + "traits": { + "smithy.api#documentation": "

The Amazon CloudWatch log settings for a playback configuration.

" + } + }, "ManifestProcessingRules": { "target": "com.amazonaws.mediatailor#ManifestProcessingRules", "traits": { @@ -2171,6 +2233,21 @@ "smithy.api#documentation": "

The configuration for pre-roll ad insertion.

" } }, + "com.amazonaws.mediatailor#LogConfiguration": { + "type": "structure", + "members": { + "PercentEnabled": { + "target": "com.amazonaws.mediatailor#__integer", + "traits": { + "smithy.api#documentation": "

The percentage of session logs that MediaTailor sends to your Cloudwatch Logs account. For example, if your playback configuration has 1000 sessions and percentEnabled is set to 60, MediaTailor sends logs for 600 of the sessions to CloudWatch Logs. MediaTailor decides at random which of the playback configuration sessions to send logs for. If you want to view logs for a specific session, you can use the debug log mode.

Valid values: 0 - 100

", + "smithy.api#required": {} + } + } + }, + "traits": { + "smithy.api#documentation": "

Returns Amazon CloudWatch log settings for a playback configuration.

" + } + }, "com.amazonaws.mediatailor#ManifestProcessingRules": { "type": "structure", "members": { @@ -2198,6 +2275,9 @@ "type": "service", "version": "2018-04-23", "operations": [ + { + "target": "com.amazonaws.mediatailor#ConfigureLogsForPlaybackConfiguration" + }, { "target": "com.amazonaws.mediatailor#CreateChannel" }, @@ -2403,6 +2483,12 @@ "smithy.api#documentation": "

The configuration for pre-roll ad insertion.

" } }, + "LogConfiguration": { + "target": "com.amazonaws.mediatailor#LogConfiguration", + "traits": { + "smithy.api#documentation": "

The Amazon CloudWatch log settings for a playback configuration.

" + } + }, "ManifestProcessingRules": { "target": "com.amazonaws.mediatailor#ManifestProcessingRules", "traits": { @@ -2683,6 +2769,12 @@ "smithy.api#documentation": "

The configuration for pre-roll ad insertion.

" } }, + "LogConfiguration": { + "target": "com.amazonaws.mediatailor#LogConfiguration", + "traits": { + "smithy.api#documentation": "

The Amazon CloudWatch log settings for a playback configuration.

" + } + }, "ManifestProcessingRules": { "target": "com.amazonaws.mediatailor#ManifestProcessingRules", "traits": { diff --git a/codegen/sdk-codegen/aws-models/opensearch.2021-01-01.json b/codegen/sdk-codegen/aws-models/opensearch.2021-01-01.json index 09ed0c15182..1da3cb54d15 100644 --- a/codegen/sdk-codegen/aws-models/opensearch.2021-01-01.json +++ b/codegen/sdk-codegen/aws-models/opensearch.2021-01-01.json @@ -1010,7 +1010,10 @@ } }, "ColdStorageOptions": { - "target": "com.amazonaws.opensearch#ColdStorageOptions" + "target": "com.amazonaws.opensearch#ColdStorageOptions", + "traits": { + "smithy.api#documentation": "

Specifies the ColdStorageOptions config for a Domain

" + } } }, "traits": { @@ -1099,9 +1102,13 @@ "Enabled": { "target": "com.amazonaws.opensearch#Boolean", "traits": { + "smithy.api#documentation": "

Enable cold storage option. Accepted values true or false

", "smithy.api#required": {} } } + }, + "traits": { + "smithy.api#documentation": "

Specifies the configuration for cold storage options such as enabled

" } }, "com.amazonaws.opensearch#CommitMessage": { @@ -2859,6 +2866,12 @@ "traits": { "smithy.api#documentation": "

The DomainName.\n

" } + }, + "EngineType": { + "target": "com.amazonaws.opensearch#EngineType", + "traits": { + "smithy.api#documentation": "

Specifies the EngineType of the domain.

" + } } } }, @@ -3304,6 +3317,21 @@ "target": "com.amazonaws.opensearch#ServiceUrl" } }, + "com.amazonaws.opensearch#EngineType": { + "type": "string", + "traits": { + "smithy.api#enum": [ + { + "value": "OpenSearch", + "name": "OpenSearch" + }, + { + "value": "Elasticsearch", + "name": "Elasticsearch" + } + ] + } + }, "com.amazonaws.opensearch#ErrorDetails": { "type": "structure", "members": { @@ -3995,6 +4023,9 @@ }, "com.amazonaws.opensearch#ListDomainNames": { "type": "operation", + "input": { + "target": "com.amazonaws.opensearch#ListDomainNamesRequest" + }, "output": { "target": "com.amazonaws.opensearch#ListDomainNamesResponse" }, @@ -4015,18 +4046,33 @@ } } }, + "com.amazonaws.opensearch#ListDomainNamesRequest": { + "type": "structure", + "members": { + "EngineType": { + "target": "com.amazonaws.opensearch#EngineType", + "traits": { + "smithy.api#documentation": "

Optional parameter to filter the output by domain engine type. Acceptable values are 'Elasticsearch' and 'OpenSearch'.

", + "smithy.api#httpQuery": "engineType" + } + } + }, + "traits": { + "smithy.api#documentation": "

Container for the parameters to the ListDomainNames operation.

" + } + }, "com.amazonaws.opensearch#ListDomainNamesResponse": { "type": "structure", "members": { "DomainNames": { "target": "com.amazonaws.opensearch#DomainInfoList", "traits": { - "smithy.api#documentation": "

List of domain names.

" + "smithy.api#documentation": "

List of domain names and respective engine types.

" } } }, "traits": { - "smithy.api#documentation": "

The result of a ListDomainNames operation. Contains the names of all domains owned by\n this account.\n

" + "smithy.api#documentation": "

The result of a ListDomainNames operation. Contains the names of all domains owned by this account and their respective engine types.

" } }, "com.amazonaws.opensearch#ListDomainsForPackage": { diff --git a/codegen/sdk-codegen/aws-models/ssm.2014-11-06.json b/codegen/sdk-codegen/aws-models/ssm.2014-11-06.json index 1b90e4a4a25..323c611266f 100644 --- a/codegen/sdk-codegen/aws-models/ssm.2014-11-06.json +++ b/codegen/sdk-codegen/aws-models/ssm.2014-11-06.json @@ -758,7 +758,7 @@ } ], "traits": { - "smithy.api#documentation": "

Associates a related resource to a Systems Manager OpsCenter OpsItem. For example, you can associate\n an Incident Manager incident or analysis with an OpsItem. Incident Manager is a capability of\n Amazon Web Services Systems Manager.

" + "smithy.api#documentation": "

Associates a related item to a Systems Manager OpsCenter OpsItem. For example, you can associate an\n Incident Manager incident or analysis with an OpsItem. Incident Manager and OpsCenter are capabilities of\n Amazon Web Services Systems Manager.

" } }, "com.amazonaws.ssm#AssociateOpsItemRelatedItemRequest": { @@ -781,7 +781,7 @@ "ResourceType": { "target": "com.amazonaws.ssm#OpsItemRelatedItemAssociationResourceType", "traits": { - "smithy.api#documentation": "

The type of resource that you want to associate with an OpsItem. OpsCenter supports the\n following types:

\n

\n AWS::SSMIncidents::IncidentRecord: an Incident Manager incident. Incident Manager is a\n capability of Amazon Web Services Systems Manager.

\n

\n AWS::SSM::Document: a Systems Manager (SSM) document.

", + "smithy.api#documentation": "

The type of resource that you want to associate with an OpsItem. OpsCenter supports the\n following types:

\n

\n AWS::SSMIncidents::IncidentRecord: an Incident Manager incident.

\n

\n AWS::SSM::Document: a Systems Manager (SSM) document.

", "smithy.api#required": {} } }, @@ -3197,7 +3197,7 @@ "value": { "target": "com.amazonaws.ssm#CommandFilterValue", "traits": { - "smithy.api#documentation": "

The filter value. Valid values for each filter key are as follows:

\n ", + "smithy.api#documentation": "

The filter value. Valid values for each filter key are as follows:

\n ", "smithy.api#required": {} } } @@ -3281,7 +3281,7 @@ "InstanceName": { "target": "com.amazonaws.ssm#InstanceTagName", "traits": { - "smithy.api#documentation": "

The name of the invocation target. For EC2 instances this is the value for the\n aws:Name tag. For on-premises instances, this is the name of the instance.

" + "smithy.api#documentation": "

The fully qualified host name of the managed instance.

" } }, "Comment": { @@ -4577,7 +4577,7 @@ "Content": { "target": "com.amazonaws.ssm#DocumentContent", "traits": { - "smithy.api#documentation": "

The content for the new SSM document in JSON or YAML format. We recommend storing the\n contents for your new document in an external JSON or YAML file and referencing the file in a\n command.

\n

For examples, see the following topics in the Amazon Web Services Systems Manager User Guide.

\n ", + "smithy.api#documentation": "

The content for the new SSM document in JSON or YAML format. We recommend storing the\n contents for your new document in an external JSON or YAML file and referencing the file in a\n command.

\n

For examples, see the following topics in the Amazon Web Services Systems Manager User Guide.

\n ", "smithy.api#required": {} } }, @@ -6428,7 +6428,7 @@ "Filters": { "target": "com.amazonaws.ssm#PatchOrchestratorFilterList", "traits": { - "smithy.api#documentation": "

Each element in the array is a structure containing a key-value pair.

\n

\n Windows Server\n

\n

Supported keys for Windows Server instance patches include the following:

\n \n\n

\n Linux\n

\n \n

When specifying filters for Linux patches, you must specify a key-pair for\n PRODUCT. For example, using the Command Line Interface (CLI), the\n following command fails:

\n

\n aws ssm describe-available-patches --filters\n Key=CVE_ID,Values=CVE-2018-3615\n

\n

However, the following command succeeds:

\n

\n aws ssm describe-available-patches --filters Key=PRODUCT,Values=AmazonLinux2018.03\n Key=CVE_ID,Values=CVE-2018-3615\n

\n \n

Supported keys for Linux instance patches include the following:

\n " + "smithy.api#documentation": "

Each element in the array is a structure containing a key-value pair.

\n

\n Windows Server\n

\n

Supported keys for Windows Server instance patches include the following:

\n \n\n

\n Linux\n

\n \n

When specifying filters for Linux patches, you must specify a key-pair for\n PRODUCT. For example, using the Command Line Interface (CLI), the\n following command fails:

\n

\n aws ssm describe-available-patches --filters Key=CVE_ID,Values=CVE-2018-3615\n

\n

However, the following command succeeds:

\n

\n aws ssm describe-available-patches --filters Key=PRODUCT,Values=AmazonLinux2018.03\n Key=CVE_ID,Values=CVE-2018-3615\n

\n \n

Supported keys for Linux instance patches include the following:

\n " } }, "MaxResults": { @@ -7882,7 +7882,7 @@ } ], "traits": { - "smithy.api#documentation": "

Get information about a parameter.

\n

Request results are returned on a best-effort basis. If you specify MaxResults\n in the request, the response includes information up to the limit specified. The number of items\n returned, however, can be between zero and the value of MaxResults. If the service\n reaches an internal limit while processing the results, it stops the operation and returns the\n matching values up to that point and a NextToken. You can specify the\n NextToken in a subsequent call to get the next set of results.

", + "smithy.api#documentation": "

Get information about a parameter.

\n

Request results are returned on a best-effort basis. If you specify MaxResults\n in the request, the response includes information up to the limit specified. The number of items\n returned, however, can be between zero and the value of MaxResults. If the service\n reaches an internal limit while processing the results, it stops the operation and returns the\n matching values up to that point and a NextToken. You can specify the\n NextToken in a subsequent call to get the next set of results.

\n \n

If you change the KMS key alias for the KMS key used to encrypt a parameter, then you must\n also update the key alias the parameter uses to reference KMS. Otherwise,\n DescribeParameters retrieves whatever the original key alias was\n referencing.

\n ", "smithy.api#paginated": { "inputToken": "NextToken", "outputToken": "NextToken", @@ -8361,7 +8361,7 @@ } ], "traits": { - "smithy.api#documentation": "

Deletes the association between an OpsItem and a related resource. For example, this API\n operation can delete an Incident Manager incident from an OpsItem. Incident Manager is a capability of\n Amazon Web Services Systems Manager.

" + "smithy.api#documentation": "

Deletes the association between an OpsItem and a related item. For example, this API\n operation can delete an Incident Manager incident from an OpsItem. Incident Manager is a capability of\n Amazon Web Services Systems Manager.

" } }, "com.amazonaws.ssm#DisassociateOpsItemRelatedItemRequest": { @@ -8370,14 +8370,14 @@ "OpsItemId": { "target": "com.amazonaws.ssm#OpsItemId", "traits": { - "smithy.api#documentation": "

The ID of the OpsItem for which you want to delete an association between the OpsItem and a\n related resource.

", + "smithy.api#documentation": "

The ID of the OpsItem for which you want to delete an association between the OpsItem and a\n related item.

", "smithy.api#required": {} } }, "AssociationId": { "target": "com.amazonaws.ssm#OpsItemRelatedItemAssociationId", "traits": { - "smithy.api#documentation": "

The ID of the association for which you want to delete an association between the OpsItem\n and a related resource.

", + "smithy.api#documentation": "

The ID of the association for which you want to delete an association between the OpsItem\n and a related item.

", "smithy.api#required": {} } } @@ -9881,6 +9881,12 @@ "comparator": "stringEquals" } } + }, + { + "state": "retry", + "matcher": { + "errorType": "InvocationDoesNotExist" + } } ], "minDelay": 5 @@ -11081,6 +11087,12 @@ "traits": { "smithy.api#documentation": "

The retrieved task description.

" } + }, + "CutoffBehavior": { + "target": "com.amazonaws.ssm#MaintenanceWindowTaskCutoffBehavior", + "traits": { + "smithy.api#documentation": "

The action to take on tasks when the maintenance window cutoff time is reached.\n CONTINUE_TASK means that tasks continue to run. For Automation, Lambda, Step Functions tasks, CANCEL_TASK means that currently\n running task invocations continue, but no new task invocations are started. For Run Command\n tasks, CANCEL_TASK means the system attempts to stop the task by sending a\n CancelCommand operation.

" + } } } }, @@ -11353,7 +11365,7 @@ } ], "traits": { - "smithy.api#documentation": "

Retrieves the history of all changes to a parameter.

", + "smithy.api#documentation": "

Retrieves the history of all changes to a parameter.

\n \n

If you change the KMS key alias for the KMS key used to encrypt a parameter, then you must\n also update the key alias the parameter uses to reference KMS. Otherwise,\n GetParameterHistory retrieves whatever the original key alias was\n referencing.

\n ", "smithy.api#paginated": { "inputToken": "NextToken", "outputToken": "NextToken", @@ -11526,7 +11538,7 @@ "ParameterFilters": { "target": "com.amazonaws.ssm#ParameterStringFilterList", "traits": { - "smithy.api#documentation": "

Filters to limit the request results.

\n \n

For GetParametersByPath, the following filter Key names are\n supported: Type, KeyId, Label, and\n DataType.

\n

The following Key values are not supported for\n GetParametersByPath: tag, Name, Path, and\n Tier.

\n " + "smithy.api#documentation": "

Filters to limit the request results.

\n \n

The following Key values are supported for GetParametersByPath:\n Type, KeyId, and Label.

\n

The following Key values aren't supported for\n GetParametersByPath: tag, DataType, Name,\n Path, and Tier.

\n " } }, "WithDecryption": { @@ -15232,7 +15244,7 @@ } ], "traits": { - "smithy.api#documentation": "

Lists all related-item resources associated with an OpsItem.

", + "smithy.api#documentation": "

Lists all related-item resources associated with a Systems Manager OpsCenter OpsItem. OpsCenter is a\n capability of Amazon Web Services Systems Manager.

", "smithy.api#paginated": { "inputToken": "NextToken", "outputToken": "NextToken", @@ -16479,6 +16491,12 @@ "traits": { "smithy.api#documentation": "

A description of the task.

" } + }, + "CutoffBehavior": { + "target": "com.amazonaws.ssm#MaintenanceWindowTaskCutoffBehavior", + "traits": { + "smithy.api#documentation": "

The specification for whether tasks should continue to run after the cutoff time specified\n in the maintenance windows is reached.

" + } } }, "traits": { @@ -16494,6 +16512,21 @@ } } }, + "com.amazonaws.ssm#MaintenanceWindowTaskCutoffBehavior": { + "type": "string", + "traits": { + "smithy.api#enum": [ + { + "value": "CONTINUE_TASK", + "name": "ContinueTask" + }, + { + "value": "CANCEL_TASK", + "name": "CancelTask" + } + ] + } + }, "com.amazonaws.ssm#MaintenanceWindowTaskId": { "type": "string", "traits": { @@ -19207,7 +19240,7 @@ "Key": { "target": "com.amazonaws.ssm#ParameterStringFilterKey", "traits": { - "smithy.api#documentation": "

The name of the filter.

\n

The ParameterStringFilter object is used by the DescribeParameters and GetParametersByPath API operations.\n However, not all of the pattern values listed for Key can be used with both\n operations.

\n

For DescribeActions, all of the listed patterns are valid, with the exception\n of Label.

\n

For GetParametersByPath, the following patterns listed for Key\n aren't valid: tag, Name, Path, and\n Tier.

\n

For examples of Amazon Web Services CLI commands demonstrating valid parameter filter constructions, see\n Searching for Systems Manager parameters in the Amazon Web Services Systems Manager User Guide.

", + "smithy.api#documentation": "

The name of the filter.

\n

The ParameterStringFilter object is used by the DescribeParameters and GetParametersByPath API operations.\n However, not all of the pattern values listed for Key can be used with both\n operations.

\n

For DescribeActions, all of the listed patterns are valid except\n Label.

\n

For GetParametersByPath, the following patterns listed for Key\n aren't valid: tag, DataType, Name, Path, and\n Tier.

\n

For examples of Amazon Web Services CLI commands demonstrating valid parameter filter constructions, see\n Searching for Systems Manager parameters in the Amazon Web Services Systems Manager User Guide.

", "smithy.api#required": {} } }, @@ -21229,6 +21262,12 @@ "smithy.api#documentation": "

User-provided idempotency token.

", "smithy.api#idempotencyToken": {} } + }, + "CutoffBehavior": { + "target": "com.amazonaws.ssm#MaintenanceWindowTaskCutoffBehavior", + "traits": { + "smithy.api#documentation": "

Indicates whether tasks should continue to run after the cutoff time specified in the\n maintenance windows is reached.

\n " + } } } }, @@ -22522,7 +22561,7 @@ "DocumentName": { "target": "com.amazonaws.ssm#DocumentARN", "traits": { - "smithy.api#documentation": "

The name of the Amazon Web Services Systems Manager document (SSM document) to run. This can be a public document or a\n custom document. To run a shared document belonging to another account, specify the document ARN.\n For more information about how to use shared documents, see Using shared SSM documents\n in the Amazon Web Services Systems Manager User Guide.

", + "smithy.api#documentation": "

The name of the Amazon Web Services Systems Manager document (SSM document) to run. This can be a public document or a\n custom document. To run a shared document belonging to another account, specify the document\n Amazon Resource Name (ARN). For more information about how to use shared documents, see Using shared\n SSM documents in the Amazon Web Services Systems Manager User Guide.

\n \n

If you specify a document name or ARN that hasn't been shared with your account, you\n receive an InvalidDocument error.

\n ", "smithy.api#required": {} } }, @@ -25273,6 +25312,12 @@ "smithy.api#box": {}, "smithy.api#documentation": "

If True, then all fields that are required by the RegisterTaskWithMaintenanceWindow operation are also required for this API request.\n Optional fields that aren't specified are set to null.

" } + }, + "CutoffBehavior": { + "target": "com.amazonaws.ssm#MaintenanceWindowTaskCutoffBehavior", + "traits": { + "smithy.api#documentation": "

Indicates whether tasks should continue to run after the cutoff time specified in the\n maintenance windows is reached.

\n " + } } } }, @@ -25356,6 +25401,12 @@ "traits": { "smithy.api#documentation": "

The updated task description.

" } + }, + "CutoffBehavior": { + "target": "com.amazonaws.ssm#MaintenanceWindowTaskCutoffBehavior", + "traits": { + "smithy.api#documentation": "

The specification for whether tasks should continue to run after the cutoff time specified\n in the maintenance windows is reached.

" + } } } }, @@ -25877,7 +25928,7 @@ "SettingValue": { "target": "com.amazonaws.ssm#ServiceSettingValue", "traits": { - "smithy.api#documentation": "

The new value to specify for the service setting. For the\n /ssm/parameter-store/default-parameter-tier setting ID, the setting value can be\n one of the following.

\n \n

For the /ssm/parameter-store/high-throughput-enabled, and\n /ssm/managed-instance/activation-tier setting IDs, the setting value can be true or\n false.

\n

For the /ssm/automation/customer-script-log-destination setting ID, the setting\n value can be CloudWatch.

\n

For the /ssm/automation/customer-script-log-group-name setting ID, the setting\n value can be the name of an Amazon CloudWatch Logs log group.

\n

For the /ssm/documents/console/public-sharing-permission setting ID, the\n setting value can be Enable or Disable.

", + "smithy.api#documentation": "

The new value to specify for the service setting. The following list specifies the available\n values for each setting.

\n ", "smithy.api#required": {} } } diff --git a/codegen/sdk-codegen/aws-models/wafv2.2019-07-29.json b/codegen/sdk-codegen/aws-models/wafv2.2019-07-29.json index d94bd6650ca..4589d08b6bf 100644 --- a/codegen/sdk-codegen/aws-models/wafv2.2019-07-29.json +++ b/codegen/sdk-codegen/aws-models/wafv2.2019-07-29.json @@ -2310,7 +2310,7 @@ "ResourceArn": { "target": "com.amazonaws.wafv2#ResourceArn", "traits": { - "smithy.api#documentation": "

The Amazon Resource Name (ARN) of the web ACL from which you want to delete the LoggingConfiguration.

", + "smithy.api#documentation": "

The Amazon Resource Name (ARN) of the web ACL from which you want to delete the \n LoggingConfiguration.

", "smithy.api#required": {} } } @@ -3186,7 +3186,7 @@ "ResourceArn": { "target": "com.amazonaws.wafv2#ResourceArn", "traits": { - "smithy.api#documentation": "

The Amazon Resource Name (ARN) of the web ACL for which you want to get the LoggingConfiguration.

", + "smithy.api#documentation": "

The Amazon Resource Name (ARN) of the web ACL for which you want to get the \n LoggingConfiguration.

", "smithy.api#required": {} } } @@ -5890,6 +5890,35 @@ "smithy.api#documentation": "

A single regular expression. This is used in a RegexPatternSet.

" } }, + "com.amazonaws.wafv2#RegexMatchStatement": { + "type": "structure", + "members": { + "RegexString": { + "target": "com.amazonaws.wafv2#RegexPatternString", + "traits": { + "smithy.api#documentation": "

The string representing the regular expression.

", + "smithy.api#required": {} + } + }, + "FieldToMatch": { + "target": "com.amazonaws.wafv2#FieldToMatch", + "traits": { + "smithy.api#documentation": "

The part of a web request that you want WAF to inspect. For more information, see FieldToMatch.

", + "smithy.api#required": {} + } + }, + "TextTransformations": { + "target": "com.amazonaws.wafv2#TextTransformations", + "traits": { + "smithy.api#documentation": "

Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. \n If you specify one or more transformations in a rule statement, WAF performs all transformations on the \n content of the request component identified by FieldToMatch, starting from the lowest priority setting, before inspecting the content for a match.

", + "smithy.api#required": {} + } + } + }, + "traits": { + "smithy.api#documentation": "

A rule statement used to search web request components for a match against a single regular expression.

" + } + }, "com.amazonaws.wafv2#RegexPatternSet": { "type": "structure", "members": { @@ -6628,6 +6657,12 @@ "traits": { "smithy.api#documentation": "

A rule statement that defines a string match search against labels that have been added to the web request by rules that have already run in the web ACL.

\n

The label match statement provides the label or namespace string to search for. The label string can represent a part or all of the fully qualified label name that had been added to the web request. Fully qualified labels have a prefix, optional namespaces, and label name. The prefix identifies the rule group or web ACL context of the rule that added the label. If you do not provide the fully qualified name in your label match string, WAF performs the search for labels that were added in the same context as the label match statement.

" } + }, + "RegexMatchStatement": { + "target": "com.amazonaws.wafv2#RegexMatchStatement", + "traits": { + "smithy.api#documentation": "

A rule statement used to search web request components for a match against a single regular expression.

" + } } }, "traits": { @@ -7693,7 +7728,7 @@ } }, "traits": { - "smithy.api#documentation": "

The operation failed because WAF didn't recognize a parameter in the request. For\n example:

\n ", + "smithy.api#documentation": "

The operation failed because WAF didn't recognize a parameter in the request. For\n example:

\n ", "smithy.api#error": "client" } }, diff --git a/codegen/smithy-aws-go-codegen/src/main/resources/software/amazon/smithy/aws/go/codegen/endpoint-prefix.json b/codegen/smithy-aws-go-codegen/src/main/resources/software/amazon/smithy/aws/go/codegen/endpoint-prefix.json index a6d3bb74dcb..c18f8929ffe 100644 --- a/codegen/smithy-aws-go-codegen/src/main/resources/software/amazon/smithy/aws/go/codegen/endpoint-prefix.json +++ b/codegen/smithy-aws-go-codegen/src/main/resources/software/amazon/smithy/aws/go/codegen/endpoint-prefix.json @@ -140,6 +140,7 @@ "Ivs": "ivs", "KMS": "kms", "Kafka": "kafka", + "KafkaConnect": "kafkaconnect", "Kendra": "kendra", "Kinesis": "kinesis", "Kinesis Analytics": "kinesisanalytics", diff --git a/codegen/smithy-aws-go-codegen/src/main/resources/software/amazon/smithy/aws/go/codegen/endpoints.json b/codegen/smithy-aws-go-codegen/src/main/resources/software/amazon/smithy/aws/go/codegen/endpoints.json index f8e122bf07a..b15bb7164d4 100644 --- a/codegen/smithy-aws-go-codegen/src/main/resources/software/amazon/smithy/aws/go/codegen/endpoints.json +++ b/codegen/smithy-aws-go-codegen/src/main/resources/software/amazon/smithy/aws/go/codegen/endpoints.json @@ -898,6 +898,22 @@ "us-west-2" : { } } }, + "auditmanager" : { + "endpoints" : { + "ap-northeast-1" : { }, + "ap-south-1" : { }, + "ap-southeast-1" : { }, + "ap-southeast-2" : { }, + "ca-central-1" : { }, + "eu-central-1" : { }, + "eu-west-1" : { }, + "eu-west-2" : { }, + "us-east-1" : { }, + "us-east-2" : { }, + "us-west-1" : { }, + "us-west-2" : { } + } + }, "autoscaling" : { "defaults" : { "protocols" : [ "http", "https" ] @@ -1348,6 +1364,7 @@ }, "codecommit" : { "endpoints" : { + "af-south-1" : { }, "ap-east-1" : { }, "ap-northeast-1" : { }, "ap-northeast-2" : { }, @@ -3991,6 +4008,26 @@ "us-west-2" : { } } }, + "kafkaconnect" : { + "endpoints" : { + "ap-northeast-1" : { }, + "ap-northeast-2" : { }, + "ap-south-1" : { }, + "ap-southeast-1" : { }, + "ap-southeast-2" : { }, + "ca-central-1" : { }, + "eu-central-1" : { }, + "eu-north-1" : { }, + "eu-west-1" : { }, + "eu-west-2" : { }, + "eu-west-3" : { }, + "sa-east-1" : { }, + "us-east-1" : { }, + "us-east-2" : { }, + "us-west-1" : { }, + "us-west-2" : { } + } + }, "kinesis" : { "endpoints" : { "af-south-1" : { }, @@ -4113,6 +4150,7 @@ "ap-east-1" : { }, "ap-northeast-1" : { }, "ap-northeast-2" : { }, + "ap-northeast-3" : { }, "ap-south-1" : { }, "ap-southeast-1" : { }, "ap-southeast-2" : { }, @@ -4642,7 +4680,9 @@ }, "models-v2-lex" : { "endpoints" : { + "af-south-1" : { }, "ap-northeast-1" : { }, + "ap-northeast-2" : { }, "ap-southeast-1" : { }, "ap-southeast-2" : { }, "ca-central-1" : { }, @@ -5368,6 +5408,24 @@ "us-west-2" : { } } }, + "quicksight" : { + "endpoints" : { + "ap-northeast-1" : { }, + "ap-northeast-2" : { }, + "ap-south-1" : { }, + "ap-southeast-1" : { }, + "ap-southeast-2" : { }, + "api" : { }, + "ca-central-1" : { }, + "eu-central-1" : { }, + "eu-west-1" : { }, + "eu-west-2" : { }, + "sa-east-1" : { }, + "us-east-1" : { }, + "us-east-2" : { }, + "us-west-2" : { } + } + }, "ram" : { "endpoints" : { "af-south-1" : { }, @@ -5705,7 +5763,9 @@ }, "runtime-v2-lex" : { "endpoints" : { + "af-south-1" : { }, "ap-northeast-1" : { }, + "ap-northeast-2" : { }, "ap-southeast-1" : { }, "ap-southeast-2" : { }, "ca-central-1" : { }, @@ -7816,6 +7876,12 @@ "cn-northwest-1" : { } } }, + "appmesh" : { + "endpoints" : { + "cn-north-1" : { }, + "cn-northwest-1" : { } + } + }, "appsync" : { "endpoints" : { "cn-north-1" : { }, @@ -9559,6 +9625,17 @@ "isRegionalized" : false, "partitionEndpoint" : "aws-us-gov-global" }, + "identitystore" : { + "endpoints" : { + "fips-us-gov-west-1" : { + "credentialScope" : { + "region" : "us-gov-west-1" + }, + "hostname" : "identitystore.us-gov-west-1.amazonaws.com" + }, + "us-gov-west-1" : { } + } + }, "inspector" : { "endpoints" : { "fips-us-gov-east-1" : { @@ -9600,6 +9677,21 @@ "us-gov-west-1" : { } } }, + "iotevents" : { + "endpoints" : { + "us-gov-west-1" : { } + } + }, + "ioteventsdata" : { + "endpoints" : { + "us-gov-west-1" : { + "credentialScope" : { + "region" : "us-gov-west-1" + }, + "hostname" : "data.iotevents.us-gov-west-1.amazonaws.com" + } + } + }, "iotsecuredtunneling" : { "endpoints" : { "fips-us-gov-east-1" : { @@ -9904,6 +9996,12 @@ "us-gov-west-1" : { } } }, + "quicksight" : { + "endpoints" : { + "api" : { }, + "us-gov-west-1" : { } + } + }, "ram" : { "endpoints" : { "us-gov-east-1" : { diff --git a/service/appmesh/internal/endpoints/endpoints.go b/service/appmesh/internal/endpoints/endpoints.go index 93ee60c76fb..dea6aca8980 100644 --- a/service/appmesh/internal/endpoints/endpoints.go +++ b/service/appmesh/internal/endpoints/endpoints.go @@ -94,6 +94,10 @@ var defaultPartitions = endpoints.Partitions{ }, RegionRegex: partitionRegexp.AwsCn, IsRegionalized: true, + Endpoints: endpoints.Endpoints{ + "cn-north-1": endpoints.Endpoint{}, + "cn-northwest-1": endpoints.Endpoint{}, + }, }, { ID: "aws-iso", diff --git a/service/appsync/api_op_CreateDataSource.go b/service/appsync/api_op_CreateDataSource.go index fc157a922ef..9da3adbd29a 100644 --- a/service/appsync/api_op_CreateDataSource.go +++ b/service/appsync/api_op_CreateDataSource.go @@ -50,7 +50,10 @@ type CreateDataSourceInput struct { // Amazon DynamoDB settings. DynamodbConfig *types.DynamodbDataSourceConfig - // Amazon Elasticsearch Service settings. + // Amazon OpenSearch Service settings. As of September 2021, Amazon Elasticsearch + // service is Amazon OpenSearch Service. This configuration is deprecated. For new + // data sources, use CreateDataSourceRequest$openSearchServiceConfig to create an + // OpenSearch data source. ElasticsearchConfig *types.ElasticsearchDataSourceConfig // HTTP endpoint settings. @@ -59,6 +62,9 @@ type CreateDataSourceInput struct { // Amazon Web Services Lambda settings. LambdaConfig *types.LambdaDataSourceConfig + // Amazon OpenSearch Service settings. + OpenSearchServiceConfig *types.OpenSearchServiceDataSourceConfig + // Relational database settings. RelationalDatabaseConfig *types.RelationalDatabaseDataSourceConfig diff --git a/service/appsync/api_op_CreateGraphqlApi.go b/service/appsync/api_op_CreateGraphqlApi.go index 74237ce29aa..329caf11bcf 100644 --- a/service/appsync/api_op_CreateGraphqlApi.go +++ b/service/appsync/api_op_CreateGraphqlApi.go @@ -29,8 +29,8 @@ func (c *Client) CreateGraphqlApi(ctx context.Context, params *CreateGraphqlApiI type CreateGraphqlApiInput struct { - // The authentication type: API key, Identity and Access Management, OIDC, or - // Amazon Cognito user pools. + // The authentication type: API key, Identity and Access Management, OIDC, Amazon + // Cognito user pools, or Amazon Web Services Lambda. // // This member is required. AuthenticationType types.AuthenticationType @@ -43,7 +43,7 @@ type CreateGraphqlApiInput struct { // A list of additional authentication providers for the GraphqlApi API. AdditionalAuthenticationProviders []types.AdditionalAuthenticationProvider - // Configuration for AWS Lambda function authorization. + // Configuration for Amazon Web Services Lambda function authorization. LambdaAuthorizerConfig *types.LambdaAuthorizerConfig // The Amazon CloudWatch Logs configuration. diff --git a/service/appsync/api_op_UpdateDataSource.go b/service/appsync/api_op_UpdateDataSource.go index 114737c60d0..ad76a8eb960 100644 --- a/service/appsync/api_op_UpdateDataSource.go +++ b/service/appsync/api_op_UpdateDataSource.go @@ -50,7 +50,10 @@ type UpdateDataSourceInput struct { // The new Amazon DynamoDB configuration. DynamodbConfig *types.DynamodbDataSourceConfig - // The new Elasticsearch Service configuration. + // The new OpenSearch configuration. As of September 2021, Amazon Elasticsearch + // service is Amazon OpenSearch Service. This configuration is deprecated. Instead, + // use UpdateDataSourceRequest$openSearchServiceConfig to update an OpenSearch data + // source. ElasticsearchConfig *types.ElasticsearchDataSourceConfig // The new HTTP endpoint configuration. @@ -59,6 +62,9 @@ type UpdateDataSourceInput struct { // The new Amazon Web Services Lambda configuration. LambdaConfig *types.LambdaDataSourceConfig + // The new OpenSearch configuration. + OpenSearchServiceConfig *types.OpenSearchServiceDataSourceConfig + // The new relational database configuration. RelationalDatabaseConfig *types.RelationalDatabaseDataSourceConfig diff --git a/service/appsync/api_op_UpdateGraphqlApi.go b/service/appsync/api_op_UpdateGraphqlApi.go index b1644150908..15a08560516 100644 --- a/service/appsync/api_op_UpdateGraphqlApi.go +++ b/service/appsync/api_op_UpdateGraphqlApi.go @@ -45,7 +45,7 @@ type UpdateGraphqlApiInput struct { // The new authentication type for the GraphqlApi object. AuthenticationType types.AuthenticationType - // Configuration for AWS Lambda function authorization. + // Configuration for Amazon Web Services Lambda function authorization. LambdaAuthorizerConfig *types.LambdaAuthorizerConfig // The Amazon CloudWatch Logs configuration for the GraphqlApi object. diff --git a/service/appsync/deserializers.go b/service/appsync/deserializers.go index 315b73d22c5..ca95cc50c32 100644 --- a/service/appsync/deserializers.go +++ b/service/appsync/deserializers.go @@ -7130,6 +7130,11 @@ func awsRestjson1_deserializeDocumentDataSource(v **types.DataSource, value inte sv.Name = ptr.String(jtv) } + case "openSearchServiceConfig": + if err := awsRestjson1_deserializeDocumentOpenSearchServiceDataSourceConfig(&sv.OpenSearchServiceConfig, value); err != nil { + return err + } + case "relationalDatabaseConfig": if err := awsRestjson1_deserializeDocumentRelationalDatabaseDataSourceConfig(&sv.RelationalDatabaseConfig, value); err != nil { return err @@ -8231,6 +8236,55 @@ func awsRestjson1_deserializeDocumentOpenIDConnectConfig(v **types.OpenIDConnect return nil } +func awsRestjson1_deserializeDocumentOpenSearchServiceDataSourceConfig(v **types.OpenSearchServiceDataSourceConfig, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.OpenSearchServiceDataSourceConfig + if *v == nil { + sv = &types.OpenSearchServiceDataSourceConfig{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "awsRegion": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected String to be of type string, got %T instead", value) + } + sv.AwsRegion = ptr.String(jtv) + } + + case "endpoint": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected String to be of type string, got %T instead", value) + } + sv.Endpoint = ptr.String(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsRestjson1_deserializeDocumentPipelineConfig(v **types.PipelineConfig, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) diff --git a/service/appsync/serializers.go b/service/appsync/serializers.go index d7840ea03fe..02d3912bc12 100644 --- a/service/appsync/serializers.go +++ b/service/appsync/serializers.go @@ -312,6 +312,13 @@ func awsRestjson1_serializeOpDocumentCreateDataSourceInput(v *CreateDataSourceIn ok.String(*v.Name) } + if v.OpenSearchServiceConfig != nil { + ok := object.Key("openSearchServiceConfig") + if err := awsRestjson1_serializeDocumentOpenSearchServiceDataSourceConfig(v.OpenSearchServiceConfig, ok); err != nil { + return err + } + } + if v.RelationalDatabaseConfig != nil { ok := object.Key("relationalDatabaseConfig") if err := awsRestjson1_serializeDocumentRelationalDatabaseDataSourceConfig(v.RelationalDatabaseConfig, ok); err != nil { @@ -2883,6 +2890,13 @@ func awsRestjson1_serializeOpDocumentUpdateDataSourceInput(v *UpdateDataSourceIn } } + if v.OpenSearchServiceConfig != nil { + ok := object.Key("openSearchServiceConfig") + if err := awsRestjson1_serializeDocumentOpenSearchServiceDataSourceConfig(v.OpenSearchServiceConfig, ok); err != nil { + return err + } + } + if v.RelationalDatabaseConfig != nil { ok := object.Key("relationalDatabaseConfig") if err := awsRestjson1_serializeDocumentRelationalDatabaseDataSourceConfig(v.RelationalDatabaseConfig, ok); err != nil { @@ -3713,6 +3727,23 @@ func awsRestjson1_serializeDocumentOpenIDConnectConfig(v *types.OpenIDConnectCon return nil } +func awsRestjson1_serializeDocumentOpenSearchServiceDataSourceConfig(v *types.OpenSearchServiceDataSourceConfig, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if v.AwsRegion != nil { + ok := object.Key("awsRegion") + ok.String(*v.AwsRegion) + } + + if v.Endpoint != nil { + ok := object.Key("endpoint") + ok.String(*v.Endpoint) + } + + return nil +} + func awsRestjson1_serializeDocumentPipelineConfig(v *types.PipelineConfig, value smithyjson.Value) error { object := value.Object() defer object.Close() diff --git a/service/appsync/types/enums.go b/service/appsync/types/enums.go index 46aef5bb972..bbf6e718827 100644 --- a/service/appsync/types/enums.go +++ b/service/appsync/types/enums.go @@ -172,12 +172,13 @@ type DataSourceType string // Enum values for DataSourceType const ( - DataSourceTypeAwsLambda DataSourceType = "AWS_LAMBDA" - DataSourceTypeAmazonDynamodb DataSourceType = "AMAZON_DYNAMODB" - DataSourceTypeAmazonElasticsearch DataSourceType = "AMAZON_ELASTICSEARCH" - DataSourceTypeNone DataSourceType = "NONE" - DataSourceTypeHttp DataSourceType = "HTTP" - DataSourceTypeRelationalDatabase DataSourceType = "RELATIONAL_DATABASE" + DataSourceTypeAwsLambda DataSourceType = "AWS_LAMBDA" + DataSourceTypeAmazonDynamodb DataSourceType = "AMAZON_DYNAMODB" + DataSourceTypeAmazonElasticsearch DataSourceType = "AMAZON_ELASTICSEARCH" + DataSourceTypeNone DataSourceType = "NONE" + DataSourceTypeHttp DataSourceType = "HTTP" + DataSourceTypeRelationalDatabase DataSourceType = "RELATIONAL_DATABASE" + DataSourceTypeAmazonOpensearchService DataSourceType = "AMAZON_OPENSEARCH_SERVICE" ) // Values returns all known values for DataSourceType. Note that this can be @@ -191,6 +192,7 @@ func (DataSourceType) Values() []DataSourceType { "NONE", "HTTP", "RELATIONAL_DATABASE", + "AMAZON_OPENSEARCH_SERVICE", } } diff --git a/service/appsync/types/types.go b/service/appsync/types/types.go index e1cbb551a1d..9dc89853bb0 100644 --- a/service/appsync/types/types.go +++ b/service/appsync/types/types.go @@ -9,11 +9,11 @@ import ( // Describes an additional authentication provider. type AdditionalAuthenticationProvider struct { - // The authentication type: API key, Identity and Access Management, OIDC, or - // Amazon Cognito user pools. + // The authentication type: API key, Identity and Access Management, OIDC, Amazon + // Cognito user pools, or Amazon Web Services Lambda. AuthenticationType AuthenticationType - // Configuration for AWS Lambda function authorization. + // Configuration for Amazon Web Services Lambda function authorization. LambdaAuthorizerConfig *LambdaAuthorizerConfig // The OpenID Connect configuration. @@ -251,7 +251,7 @@ type DataSource struct { // Amazon DynamoDB settings. DynamodbConfig *DynamodbDataSourceConfig - // Amazon Elasticsearch Service settings. + // Amazon OpenSearch Service settings. ElasticsearchConfig *ElasticsearchDataSourceConfig // HTTP endpoint settings. @@ -263,6 +263,9 @@ type DataSource struct { // The name of the data source. Name *string + // Amazon OpenSearch Service settings. + OpenSearchServiceConfig *OpenSearchServiceDataSourceConfig + // Relational database settings. RelationalDatabaseConfig *RelationalDatabaseDataSourceConfig @@ -272,14 +275,17 @@ type DataSource struct { // The type of the data source. // + // * AWS_LAMBDA: The data source is an Amazon Web + // Services Lambda function. + // // * AMAZON_DYNAMODB: The data source is an Amazon // DynamoDB table. // - // * AMAZON_ELASTICSEARCH: The data source is an Amazon - // Elasticsearch Service domain. + // * AMAZON_ELASTICSEARCH: The data source is an Amazon OpenSearch + // Service domain. // - // * AWS_LAMBDA: The data source is an Amazon Web - // Services Lambda function. + // * AMAZON_OPENSEARCH_SERVICE: The data source is an Amazon + // OpenSearch Service domain. // // * NONE: There is no data source. This type is used // when you wish to invoke a GraphQL operation without connecting to a data source, @@ -335,7 +341,10 @@ type DynamodbDataSourceConfig struct { noSmithyDocumentSerde } -// Describes an Elasticsearch data source configuration. +// Describes an OpenSearch data source configuration. As of September 2021, Amazon +// Elasticsearch service is Amazon OpenSearch Service. This configuration is +// deprecated. For new data sources, use OpenSearchServiceDataSourceConfig to +// specify an OpenSearch data source. type ElasticsearchDataSourceConfig struct { // The Amazon Web Services Region. @@ -404,7 +413,7 @@ type GraphqlApi struct { // The authentication type. AuthenticationType AuthenticationType - // Configuration for AWS Lambda function authorization. + // Configuration for Amazon Web Services Lambda function authorization. LambdaAuthorizerConfig *LambdaAuthorizerConfig // The Amazon CloudWatch Logs configuration. @@ -454,13 +463,14 @@ type HttpDataSourceConfig struct { // may have only one Lambda authorizer configured at a time. type LambdaAuthorizerConfig struct { - // The ARN of the lambda function to be called for authorization. This may be a + // The ARN of the Lambda function to be called for authorization. This may be a // standard Lambda ARN, a version ARN (.../v3) or alias ARN. Note: This Lambda // function must have the following resource-based policy assigned to it. When // configuring Lambda authorizers in the Console, this is done for you. To do so - // with the AWS CLI, run the following: aws lambda add-permission --function-name - // "arn:aws:lambda:us-east-2:111122223333:function:my-function" --statement-id - // "appsync" --principal appsync.amazonaws.com --action lambda:InvokeFunction + // with the Amazon Web Services CLI, run the following: aws lambda add-permission + // --function-name "arn:aws:lambda:us-east-2:111122223333:function:my-function" + // --statement-id "appsync" --principal appsync.amazonaws.com --action + // lambda:InvokeFunction // // This member is required. AuthorizerUri *string @@ -470,7 +480,7 @@ type LambdaAuthorizerConfig struct { // key in its response. A value of 0 disables caching of responses. AuthorizerResultTtlInSeconds int32 - // A regular expression for validation of tokens before the Lambda Function is + // A regular expression for validation of tokens before the Lambda function is // called. IdentityValidationExpression *string @@ -565,6 +575,22 @@ type OpenIDConnectConfig struct { noSmithyDocumentSerde } +// Describes an OpenSearch data source configuration. +type OpenSearchServiceDataSourceConfig struct { + + // The Amazon Web Services Region. + // + // This member is required. + AwsRegion *string + + // The endpoint. + // + // This member is required. + Endpoint *string + + noSmithyDocumentSerde +} + // The pipeline configuration for a resolver of kind PIPELINE. type PipelineConfig struct { diff --git a/service/appsync/validators.go b/service/appsync/validators.go index 69ce6849550..706642652c9 100644 --- a/service/appsync/validators.go +++ b/service/appsync/validators.go @@ -1163,6 +1163,24 @@ func validateOpenIDConnectConfig(v *types.OpenIDConnectConfig) error { } } +func validateOpenSearchServiceDataSourceConfig(v *types.OpenSearchServiceDataSourceConfig) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "OpenSearchServiceDataSourceConfig"} + if v.Endpoint == nil { + invalidParams.Add(smithy.NewErrParamRequired("Endpoint")) + } + if v.AwsRegion == nil { + invalidParams.Add(smithy.NewErrParamRequired("AwsRegion")) + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + func validateUserPoolConfig(v *types.UserPoolConfig) error { if v == nil { return nil @@ -1249,6 +1267,11 @@ func validateOpCreateDataSourceInput(v *CreateDataSourceInput) error { invalidParams.AddNested("ElasticsearchConfig", err.(smithy.InvalidParamsError)) } } + if v.OpenSearchServiceConfig != nil { + if err := validateOpenSearchServiceDataSourceConfig(v.OpenSearchServiceConfig); err != nil { + invalidParams.AddNested("OpenSearchServiceConfig", err.(smithy.InvalidParamsError)) + } + } if v.HttpConfig != nil { if err := validateHttpDataSourceConfig(v.HttpConfig); err != nil { invalidParams.AddNested("HttpConfig", err.(smithy.InvalidParamsError)) @@ -1885,6 +1908,11 @@ func validateOpUpdateDataSourceInput(v *UpdateDataSourceInput) error { invalidParams.AddNested("ElasticsearchConfig", err.(smithy.InvalidParamsError)) } } + if v.OpenSearchServiceConfig != nil { + if err := validateOpenSearchServiceDataSourceConfig(v.OpenSearchServiceConfig); err != nil { + invalidParams.AddNested("OpenSearchServiceConfig", err.(smithy.InvalidParamsError)) + } + } if v.HttpConfig != nil { if err := validateHttpDataSourceConfig(v.HttpConfig); err != nil { invalidParams.AddNested("HttpConfig", err.(smithy.InvalidParamsError)) diff --git a/service/auditmanager/internal/endpoints/endpoints.go b/service/auditmanager/internal/endpoints/endpoints.go index f3befce5170..a4ca34775b2 100644 --- a/service/auditmanager/internal/endpoints/endpoints.go +++ b/service/auditmanager/internal/endpoints/endpoints.go @@ -62,6 +62,20 @@ var defaultPartitions = endpoints.Partitions{ }, RegionRegex: partitionRegexp.Aws, IsRegionalized: true, + Endpoints: endpoints.Endpoints{ + "ap-northeast-1": endpoints.Endpoint{}, + "ap-south-1": endpoints.Endpoint{}, + "ap-southeast-1": endpoints.Endpoint{}, + "ap-southeast-2": endpoints.Endpoint{}, + "ca-central-1": endpoints.Endpoint{}, + "eu-central-1": endpoints.Endpoint{}, + "eu-west-1": endpoints.Endpoint{}, + "eu-west-2": endpoints.Endpoint{}, + "us-east-1": endpoints.Endpoint{}, + "us-east-2": endpoints.Endpoint{}, + "us-west-1": endpoints.Endpoint{}, + "us-west-2": endpoints.Endpoint{}, + }, }, { ID: "aws-cn", diff --git a/service/codecommit/internal/endpoints/endpoints.go b/service/codecommit/internal/endpoints/endpoints.go index a74ccf07c2f..9dbee17801a 100644 --- a/service/codecommit/internal/endpoints/endpoints.go +++ b/service/codecommit/internal/endpoints/endpoints.go @@ -63,6 +63,7 @@ var defaultPartitions = endpoints.Partitions{ RegionRegex: partitionRegexp.Aws, IsRegionalized: true, Endpoints: endpoints.Endpoints{ + "af-south-1": endpoints.Endpoint{}, "ap-east-1": endpoints.Endpoint{}, "ap-northeast-1": endpoints.Endpoint{}, "ap-northeast-2": endpoints.Endpoint{}, diff --git a/service/comprehend/api_op_CreateDocumentClassifier.go b/service/comprehend/api_op_CreateDocumentClassifier.go index 2896b872d69..1ff5d9dbe0d 100644 --- a/service/comprehend/api_op_CreateDocumentClassifier.go +++ b/service/comprehend/api_op_CreateDocumentClassifier.go @@ -90,6 +90,12 @@ type CreateDocumentClassifierInput struct { // indicate its use by the sales department. Tags []types.Tag + // The version name given to the newly created classifier. Version names can have a + // maximum of 256 characters. Alphanumeric characters, hyphens (-) and underscores + // (_) are allowed. The version name must be unique among all models with the same + // classifier name in the account/AWS Region. + VersionName *string + // ID for the AWS Key Management Service (KMS) key that Amazon Comprehend uses to // encrypt data on the storage volume attached to the ML compute instance(s) that // process the analysis job. The VolumeKmsKeyId can be either of the following diff --git a/service/comprehend/api_op_CreateEntityRecognizer.go b/service/comprehend/api_op_CreateEntityRecognizer.go index da9ae5d6787..a058e97271b 100644 --- a/service/comprehend/api_op_CreateEntityRecognizer.go +++ b/service/comprehend/api_op_CreateEntityRecognizer.go @@ -80,6 +80,12 @@ type CreateEntityRecognizerInput struct { // indicate its use by the sales department. Tags []types.Tag + // The version name given to the newly created recognizer. Version names can be a + // maximum of 256 characters. Alphanumeric characters, hyphens (-) and underscores + // (_) are allowed. The version name must be unique among all models with the same + // recognizer name in the account/ AWS Region. + VersionName *string + // ID for the AWS Key Management Service (KMS) key that Amazon Comprehend uses to // encrypt data on the storage volume attached to the ML compute instance(s) that // process the analysis job. The VolumeKmsKeyId can be either of the following diff --git a/service/comprehend/api_op_ListDocumentClassifierSummaries.go b/service/comprehend/api_op_ListDocumentClassifierSummaries.go new file mode 100644 index 00000000000..720642b5eab --- /dev/null +++ b/service/comprehend/api_op_ListDocumentClassifierSummaries.go @@ -0,0 +1,212 @@ +// Code generated by smithy-go-codegen DO NOT EDIT. + +package comprehend + +import ( + "context" + "fmt" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/aws/signer/v4" + "github.com/aws/aws-sdk-go-v2/service/comprehend/types" + "github.com/aws/smithy-go/middleware" + smithyhttp "github.com/aws/smithy-go/transport/http" +) + +// Gets a list of summaries of the document classifiers that you have created +func (c *Client) ListDocumentClassifierSummaries(ctx context.Context, params *ListDocumentClassifierSummariesInput, optFns ...func(*Options)) (*ListDocumentClassifierSummariesOutput, error) { + if params == nil { + params = &ListDocumentClassifierSummariesInput{} + } + + result, metadata, err := c.invokeOperation(ctx, "ListDocumentClassifierSummaries", params, optFns, c.addOperationListDocumentClassifierSummariesMiddlewares) + if err != nil { + return nil, err + } + + out := result.(*ListDocumentClassifierSummariesOutput) + out.ResultMetadata = metadata + return out, nil +} + +type ListDocumentClassifierSummariesInput struct { + + // The maximum number of results to return on each page. The default is 100. + MaxResults *int32 + + // Identifies the next page of results to return. + NextToken *string + + noSmithyDocumentSerde +} + +type ListDocumentClassifierSummariesOutput struct { + + // The list of summaries of document classifiers. + DocumentClassifierSummariesList []types.DocumentClassifierSummary + + // Identifies the next page of results to return. + NextToken *string + + // Metadata pertaining to the operation's result. + ResultMetadata middleware.Metadata + + noSmithyDocumentSerde +} + +func (c *Client) addOperationListDocumentClassifierSummariesMiddlewares(stack *middleware.Stack, options Options) (err error) { + err = stack.Serialize.Add(&awsAwsjson11_serializeOpListDocumentClassifierSummaries{}, middleware.After) + if err != nil { + return err + } + err = stack.Deserialize.Add(&awsAwsjson11_deserializeOpListDocumentClassifierSummaries{}, middleware.After) + if err != nil { + return err + } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddComputeContentLengthMiddleware(stack); err != nil { + return err + } + if err = addResolveEndpointMiddleware(stack, options); err != nil { + return err + } + if err = v4.AddComputePayloadSHA256Middleware(stack); err != nil { + return err + } + if err = addRetryMiddlewares(stack, options); err != nil { + return err + } + if err = addHTTPSignerV4Middleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddRawResponseToMetadata(stack); err != nil { + return err + } + if err = awsmiddleware.AddRecordResponseTiming(stack); err != nil { + return err + } + if err = addClientUserAgent(stack); err != nil { + return err + } + if err = smithyhttp.AddErrorCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = stack.Initialize.Add(newServiceMetadataMiddleware_opListDocumentClassifierSummaries(options.Region), middleware.Before); err != nil { + return err + } + if err = addRequestIDRetrieverMiddleware(stack); err != nil { + return err + } + if err = addResponseErrorMiddleware(stack); err != nil { + return err + } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } + return nil +} + +// ListDocumentClassifierSummariesAPIClient is a client that implements the +// ListDocumentClassifierSummaries operation. +type ListDocumentClassifierSummariesAPIClient interface { + ListDocumentClassifierSummaries(context.Context, *ListDocumentClassifierSummariesInput, ...func(*Options)) (*ListDocumentClassifierSummariesOutput, error) +} + +var _ ListDocumentClassifierSummariesAPIClient = (*Client)(nil) + +// ListDocumentClassifierSummariesPaginatorOptions is the paginator options for +// ListDocumentClassifierSummaries +type ListDocumentClassifierSummariesPaginatorOptions struct { + // The maximum number of results to return on each page. The default is 100. + Limit int32 + + // Set to true if pagination should stop if the service returns a pagination token + // that matches the most recent token provided to the service. + StopOnDuplicateToken bool +} + +// ListDocumentClassifierSummariesPaginator is a paginator for +// ListDocumentClassifierSummaries +type ListDocumentClassifierSummariesPaginator struct { + options ListDocumentClassifierSummariesPaginatorOptions + client ListDocumentClassifierSummariesAPIClient + params *ListDocumentClassifierSummariesInput + nextToken *string + firstPage bool +} + +// NewListDocumentClassifierSummariesPaginator returns a new +// ListDocumentClassifierSummariesPaginator +func NewListDocumentClassifierSummariesPaginator(client ListDocumentClassifierSummariesAPIClient, params *ListDocumentClassifierSummariesInput, optFns ...func(*ListDocumentClassifierSummariesPaginatorOptions)) *ListDocumentClassifierSummariesPaginator { + if params == nil { + params = &ListDocumentClassifierSummariesInput{} + } + + options := ListDocumentClassifierSummariesPaginatorOptions{} + if params.MaxResults != nil { + options.Limit = *params.MaxResults + } + + for _, fn := range optFns { + fn(&options) + } + + return &ListDocumentClassifierSummariesPaginator{ + options: options, + client: client, + params: params, + firstPage: true, + } +} + +// HasMorePages returns a boolean indicating whether more pages are available +func (p *ListDocumentClassifierSummariesPaginator) HasMorePages() bool { + return p.firstPage || p.nextToken != nil +} + +// NextPage retrieves the next ListDocumentClassifierSummaries page. +func (p *ListDocumentClassifierSummariesPaginator) NextPage(ctx context.Context, optFns ...func(*Options)) (*ListDocumentClassifierSummariesOutput, error) { + if !p.HasMorePages() { + return nil, fmt.Errorf("no more pages available") + } + + params := *p.params + params.NextToken = p.nextToken + + var limit *int32 + if p.options.Limit > 0 { + limit = &p.options.Limit + } + params.MaxResults = limit + + result, err := p.client.ListDocumentClassifierSummaries(ctx, ¶ms, optFns...) + if err != nil { + return nil, err + } + p.firstPage = false + + prevToken := p.nextToken + p.nextToken = result.NextToken + + if p.options.StopOnDuplicateToken && prevToken != nil && p.nextToken != nil && *prevToken == *p.nextToken { + p.nextToken = nil + } + + return result, nil +} + +func newServiceMetadataMiddleware_opListDocumentClassifierSummaries(region string) *awsmiddleware.RegisterServiceMetadata { + return &awsmiddleware.RegisterServiceMetadata{ + Region: region, + ServiceID: ServiceID, + SigningName: "comprehend", + OperationName: "ListDocumentClassifierSummaries", + } +} diff --git a/service/comprehend/api_op_ListEntityRecognizerSummaries.go b/service/comprehend/api_op_ListEntityRecognizerSummaries.go new file mode 100644 index 00000000000..97f50c034d9 --- /dev/null +++ b/service/comprehend/api_op_ListEntityRecognizerSummaries.go @@ -0,0 +1,212 @@ +// Code generated by smithy-go-codegen DO NOT EDIT. + +package comprehend + +import ( + "context" + "fmt" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/aws/signer/v4" + "github.com/aws/aws-sdk-go-v2/service/comprehend/types" + "github.com/aws/smithy-go/middleware" + smithyhttp "github.com/aws/smithy-go/transport/http" +) + +// Gets a list of summaries for the entity recognizers that you have created. +func (c *Client) ListEntityRecognizerSummaries(ctx context.Context, params *ListEntityRecognizerSummariesInput, optFns ...func(*Options)) (*ListEntityRecognizerSummariesOutput, error) { + if params == nil { + params = &ListEntityRecognizerSummariesInput{} + } + + result, metadata, err := c.invokeOperation(ctx, "ListEntityRecognizerSummaries", params, optFns, c.addOperationListEntityRecognizerSummariesMiddlewares) + if err != nil { + return nil, err + } + + out := result.(*ListEntityRecognizerSummariesOutput) + out.ResultMetadata = metadata + return out, nil +} + +type ListEntityRecognizerSummariesInput struct { + + // The maximum number of results to return on each page. The default is 100. + MaxResults *int32 + + // Identifies the next page of results to return. + NextToken *string + + noSmithyDocumentSerde +} + +type ListEntityRecognizerSummariesOutput struct { + + // The list entity recognizer summaries. + EntityRecognizerSummariesList []types.EntityRecognizerSummary + + // The list entity recognizer summaries. + NextToken *string + + // Metadata pertaining to the operation's result. + ResultMetadata middleware.Metadata + + noSmithyDocumentSerde +} + +func (c *Client) addOperationListEntityRecognizerSummariesMiddlewares(stack *middleware.Stack, options Options) (err error) { + err = stack.Serialize.Add(&awsAwsjson11_serializeOpListEntityRecognizerSummaries{}, middleware.After) + if err != nil { + return err + } + err = stack.Deserialize.Add(&awsAwsjson11_deserializeOpListEntityRecognizerSummaries{}, middleware.After) + if err != nil { + return err + } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddComputeContentLengthMiddleware(stack); err != nil { + return err + } + if err = addResolveEndpointMiddleware(stack, options); err != nil { + return err + } + if err = v4.AddComputePayloadSHA256Middleware(stack); err != nil { + return err + } + if err = addRetryMiddlewares(stack, options); err != nil { + return err + } + if err = addHTTPSignerV4Middleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddRawResponseToMetadata(stack); err != nil { + return err + } + if err = awsmiddleware.AddRecordResponseTiming(stack); err != nil { + return err + } + if err = addClientUserAgent(stack); err != nil { + return err + } + if err = smithyhttp.AddErrorCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = stack.Initialize.Add(newServiceMetadataMiddleware_opListEntityRecognizerSummaries(options.Region), middleware.Before); err != nil { + return err + } + if err = addRequestIDRetrieverMiddleware(stack); err != nil { + return err + } + if err = addResponseErrorMiddleware(stack); err != nil { + return err + } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } + return nil +} + +// ListEntityRecognizerSummariesAPIClient is a client that implements the +// ListEntityRecognizerSummaries operation. +type ListEntityRecognizerSummariesAPIClient interface { + ListEntityRecognizerSummaries(context.Context, *ListEntityRecognizerSummariesInput, ...func(*Options)) (*ListEntityRecognizerSummariesOutput, error) +} + +var _ ListEntityRecognizerSummariesAPIClient = (*Client)(nil) + +// ListEntityRecognizerSummariesPaginatorOptions is the paginator options for +// ListEntityRecognizerSummaries +type ListEntityRecognizerSummariesPaginatorOptions struct { + // The maximum number of results to return on each page. The default is 100. + Limit int32 + + // Set to true if pagination should stop if the service returns a pagination token + // that matches the most recent token provided to the service. + StopOnDuplicateToken bool +} + +// ListEntityRecognizerSummariesPaginator is a paginator for +// ListEntityRecognizerSummaries +type ListEntityRecognizerSummariesPaginator struct { + options ListEntityRecognizerSummariesPaginatorOptions + client ListEntityRecognizerSummariesAPIClient + params *ListEntityRecognizerSummariesInput + nextToken *string + firstPage bool +} + +// NewListEntityRecognizerSummariesPaginator returns a new +// ListEntityRecognizerSummariesPaginator +func NewListEntityRecognizerSummariesPaginator(client ListEntityRecognizerSummariesAPIClient, params *ListEntityRecognizerSummariesInput, optFns ...func(*ListEntityRecognizerSummariesPaginatorOptions)) *ListEntityRecognizerSummariesPaginator { + if params == nil { + params = &ListEntityRecognizerSummariesInput{} + } + + options := ListEntityRecognizerSummariesPaginatorOptions{} + if params.MaxResults != nil { + options.Limit = *params.MaxResults + } + + for _, fn := range optFns { + fn(&options) + } + + return &ListEntityRecognizerSummariesPaginator{ + options: options, + client: client, + params: params, + firstPage: true, + } +} + +// HasMorePages returns a boolean indicating whether more pages are available +func (p *ListEntityRecognizerSummariesPaginator) HasMorePages() bool { + return p.firstPage || p.nextToken != nil +} + +// NextPage retrieves the next ListEntityRecognizerSummaries page. +func (p *ListEntityRecognizerSummariesPaginator) NextPage(ctx context.Context, optFns ...func(*Options)) (*ListEntityRecognizerSummariesOutput, error) { + if !p.HasMorePages() { + return nil, fmt.Errorf("no more pages available") + } + + params := *p.params + params.NextToken = p.nextToken + + var limit *int32 + if p.options.Limit > 0 { + limit = &p.options.Limit + } + params.MaxResults = limit + + result, err := p.client.ListEntityRecognizerSummaries(ctx, ¶ms, optFns...) + if err != nil { + return nil, err + } + p.firstPage = false + + prevToken := p.nextToken + p.nextToken = result.NextToken + + if p.options.StopOnDuplicateToken && prevToken != nil && p.nextToken != nil && *prevToken == *p.nextToken { + p.nextToken = nil + } + + return result, nil +} + +func newServiceMetadataMiddleware_opListEntityRecognizerSummaries(region string) *awsmiddleware.RegisterServiceMetadata { + return &awsmiddleware.RegisterServiceMetadata{ + Region: region, + ServiceID: ServiceID, + SigningName: "comprehend", + OperationName: "ListEntityRecognizerSummaries", + } +} diff --git a/service/comprehend/api_op_UpdateEndpoint.go b/service/comprehend/api_op_UpdateEndpoint.go index 8f456f63ac9..6a8622070f7 100644 --- a/service/comprehend/api_op_UpdateEndpoint.go +++ b/service/comprehend/api_op_UpdateEndpoint.go @@ -28,17 +28,22 @@ func (c *Client) UpdateEndpoint(ctx context.Context, params *UpdateEndpointInput type UpdateEndpointInput struct { + // The Amazon Resource Number (ARN) of the endpoint being updated. + // + // This member is required. + EndpointArn *string + + // Data access role ARN to use in case the new model is encrypted with a customer + // CMK. + DesiredDataAccessRoleArn *string + // The desired number of inference units to be used by the model using this // endpoint. Each inference unit represents of a throughput of 100 characters per // second. - // - // This member is required. DesiredInferenceUnits *int32 - // The Amazon Resource Number (ARN) of the endpoint being updated. - // - // This member is required. - EndpointArn *string + // The ARN of the new model to use when updating an existing endpoint. + DesiredModelArn *string noSmithyDocumentSerde } diff --git a/service/comprehend/deserializers.go b/service/comprehend/deserializers.go index de44bed2459..08161cba8d3 100644 --- a/service/comprehend/deserializers.go +++ b/service/comprehend/deserializers.go @@ -3923,6 +3923,123 @@ func awsAwsjson11_deserializeOpErrorListDocumentClassifiers(response *smithyhttp } } +type awsAwsjson11_deserializeOpListDocumentClassifierSummaries struct { +} + +func (*awsAwsjson11_deserializeOpListDocumentClassifierSummaries) ID() string { + return "OperationDeserializer" +} + +func (m *awsAwsjson11_deserializeOpListDocumentClassifierSummaries) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) ( + out middleware.DeserializeOutput, metadata middleware.Metadata, err error, +) { + out, metadata, err = next.HandleDeserialize(ctx, in) + if err != nil { + return out, metadata, err + } + + response, ok := out.RawResponse.(*smithyhttp.Response) + if !ok { + return out, metadata, &smithy.DeserializationError{Err: fmt.Errorf("unknown transport type %T", out.RawResponse)} + } + + if response.StatusCode < 200 || response.StatusCode >= 300 { + return out, metadata, awsAwsjson11_deserializeOpErrorListDocumentClassifierSummaries(response, &metadata) + } + output := &ListDocumentClassifierSummariesOutput{} + out.Result = output + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(response.Body, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + var shape interface{} + if err := decoder.Decode(&shape); err != nil && err != io.EOF { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + err = awsAwsjson11_deserializeOpDocumentListDocumentClassifierSummariesOutput(&output, shape) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + return out, metadata, err +} + +func awsAwsjson11_deserializeOpErrorListDocumentClassifierSummaries(response *smithyhttp.Response, metadata *middleware.Metadata) error { + var errorBuffer bytes.Buffer + if _, err := io.Copy(&errorBuffer, response.Body); err != nil { + return &smithy.DeserializationError{Err: fmt.Errorf("failed to copy error response body, %w", err)} + } + errorBody := bytes.NewReader(errorBuffer.Bytes()) + + errorCode := "UnknownError" + errorMessage := errorCode + + code := response.Header.Get("X-Amzn-ErrorType") + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(errorBody, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + code, message, err := restjson.GetErrorInfo(decoder) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return err + } + + errorBody.Seek(0, io.SeekStart) + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + if len(message) != 0 { + errorMessage = message + } + + switch { + case strings.EqualFold("InternalServerException", errorCode): + return awsAwsjson11_deserializeErrorInternalServerException(response, errorBody) + + case strings.EqualFold("InvalidRequestException", errorCode): + return awsAwsjson11_deserializeErrorInvalidRequestException(response, errorBody) + + case strings.EqualFold("TooManyRequestsException", errorCode): + return awsAwsjson11_deserializeErrorTooManyRequestsException(response, errorBody) + + default: + genericError := &smithy.GenericAPIError{ + Code: errorCode, + Message: errorMessage, + } + return genericError + + } +} + type awsAwsjson11_deserializeOpListDominantLanguageDetectionJobs struct { } @@ -4400,6 +4517,123 @@ func awsAwsjson11_deserializeOpErrorListEntityRecognizers(response *smithyhttp.R } } +type awsAwsjson11_deserializeOpListEntityRecognizerSummaries struct { +} + +func (*awsAwsjson11_deserializeOpListEntityRecognizerSummaries) ID() string { + return "OperationDeserializer" +} + +func (m *awsAwsjson11_deserializeOpListEntityRecognizerSummaries) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) ( + out middleware.DeserializeOutput, metadata middleware.Metadata, err error, +) { + out, metadata, err = next.HandleDeserialize(ctx, in) + if err != nil { + return out, metadata, err + } + + response, ok := out.RawResponse.(*smithyhttp.Response) + if !ok { + return out, metadata, &smithy.DeserializationError{Err: fmt.Errorf("unknown transport type %T", out.RawResponse)} + } + + if response.StatusCode < 200 || response.StatusCode >= 300 { + return out, metadata, awsAwsjson11_deserializeOpErrorListEntityRecognizerSummaries(response, &metadata) + } + output := &ListEntityRecognizerSummariesOutput{} + out.Result = output + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(response.Body, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + var shape interface{} + if err := decoder.Decode(&shape); err != nil && err != io.EOF { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + err = awsAwsjson11_deserializeOpDocumentListEntityRecognizerSummariesOutput(&output, shape) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + return out, metadata, err +} + +func awsAwsjson11_deserializeOpErrorListEntityRecognizerSummaries(response *smithyhttp.Response, metadata *middleware.Metadata) error { + var errorBuffer bytes.Buffer + if _, err := io.Copy(&errorBuffer, response.Body); err != nil { + return &smithy.DeserializationError{Err: fmt.Errorf("failed to copy error response body, %w", err)} + } + errorBody := bytes.NewReader(errorBuffer.Bytes()) + + errorCode := "UnknownError" + errorMessage := errorCode + + code := response.Header.Get("X-Amzn-ErrorType") + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(errorBody, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + code, message, err := restjson.GetErrorInfo(decoder) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return err + } + + errorBody.Seek(0, io.SeekStart) + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + if len(message) != 0 { + errorMessage = message + } + + switch { + case strings.EqualFold("InternalServerException", errorCode): + return awsAwsjson11_deserializeErrorInternalServerException(response, errorBody) + + case strings.EqualFold("InvalidRequestException", errorCode): + return awsAwsjson11_deserializeErrorInvalidRequestException(response, errorBody) + + case strings.EqualFold("TooManyRequestsException", errorCode): + return awsAwsjson11_deserializeErrorTooManyRequestsException(response, errorBody) + + default: + genericError := &smithy.GenericAPIError{ + Code: errorCode, + Message: errorMessage, + } + return genericError + + } +} + type awsAwsjson11_deserializeOpListEventsDetectionJobs struct { } @@ -8089,6 +8323,15 @@ func awsAwsjson11_deserializeDocumentAugmentedManifestsListItem(v **types.Augmen sv.SourceDocumentsS3Uri = ptr.String(jtv) } + case "Split": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected Split to be of type string, got %T instead", value) + } + sv.Split = types.Split(jtv) + } + default: _, _ = key, value @@ -9252,6 +9495,15 @@ func awsAwsjson11_deserializeDocumentDocumentClassifierInputDataConfig(v **types sv.S3Uri = ptr.String(jtv) } + case "TestS3Uri": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected S3Uri to be of type string, got %T instead", value) + } + sv.TestS3Uri = ptr.String(jtv) + } + default: _, _ = key, value @@ -9474,6 +9726,15 @@ func awsAwsjson11_deserializeDocumentDocumentClassifierProperties(v **types.Docu } } + case "VersionName": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected VersionName to be of type string, got %T instead", value) + } + sv.VersionName = ptr.String(jtv) + } + case "VolumeKmsKeyId": if value != nil { jtv, ok := value.(string) @@ -9505,29 +9766,150 @@ func awsAwsjson11_deserializeDocumentDocumentClassifierPropertiesList(v *[]types return nil } - shape, ok := value.([]interface{}) - if !ok { - return fmt.Errorf("unexpected JSON type %v", value) - } + shape, ok := value.([]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var cv []types.DocumentClassifierProperties + if *v == nil { + cv = []types.DocumentClassifierProperties{} + } else { + cv = *v + } + + for _, value := range shape { + var col types.DocumentClassifierProperties + destAddr := &col + if err := awsAwsjson11_deserializeDocumentDocumentClassifierProperties(&destAddr, value); err != nil { + return err + } + col = *destAddr + cv = append(cv, col) + + } + *v = cv + return nil +} + +func awsAwsjson11_deserializeDocumentDocumentClassifierSummariesList(v *[]types.DocumentClassifierSummary, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.([]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var cv []types.DocumentClassifierSummary + if *v == nil { + cv = []types.DocumentClassifierSummary{} + } else { + cv = *v + } + + for _, value := range shape { + var col types.DocumentClassifierSummary + destAddr := &col + if err := awsAwsjson11_deserializeDocumentDocumentClassifierSummary(&destAddr, value); err != nil { + return err + } + col = *destAddr + cv = append(cv, col) + + } + *v = cv + return nil +} + +func awsAwsjson11_deserializeDocumentDocumentClassifierSummary(v **types.DocumentClassifierSummary, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.DocumentClassifierSummary + if *v == nil { + sv = &types.DocumentClassifierSummary{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "DocumentClassifierName": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected ComprehendArnName to be of type string, got %T instead", value) + } + sv.DocumentClassifierName = ptr.String(jtv) + } + + case "LatestVersionCreatedAt": + if value != nil { + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.LatestVersionCreatedAt = ptr.Time(smithytime.ParseEpochSeconds(f64)) + + default: + return fmt.Errorf("expected Timestamp to be a JSON Number, got %T instead", value) + + } + } + + case "LatestVersionName": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected VersionName to be of type string, got %T instead", value) + } + sv.LatestVersionName = ptr.String(jtv) + } + + case "LatestVersionStatus": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected ModelStatus to be of type string, got %T instead", value) + } + sv.LatestVersionStatus = types.ModelStatus(jtv) + } + + case "NumberOfVersions": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected Integer to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.NumberOfVersions = ptr.Int32(int32(i64)) + } - var cv []types.DocumentClassifierProperties - if *v == nil { - cv = []types.DocumentClassifierProperties{} - } else { - cv = *v - } + default: + _, _ = key, value - for _, value := range shape { - var col types.DocumentClassifierProperties - destAddr := &col - if err := awsAwsjson11_deserializeDocumentDocumentClassifierProperties(&destAddr, value); err != nil { - return err } - col = *destAddr - cv = append(cv, col) - } - *v = cv + *v = sv return nil } @@ -9968,6 +10350,15 @@ func awsAwsjson11_deserializeDocumentEndpointProperties(v **types.EndpointProper sv.DataAccessRoleArn = ptr.String(jtv) } + case "DesiredDataAccessRoleArn": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected IamRoleArn to be of type string, got %T instead", value) + } + sv.DesiredDataAccessRoleArn = ptr.String(jtv) + } + case "DesiredInferenceUnits": if value != nil { jtv, ok := value.(json.Number) @@ -9981,6 +10372,15 @@ func awsAwsjson11_deserializeDocumentEndpointProperties(v **types.EndpointProper sv.DesiredInferenceUnits = ptr.Int32(int32(i64)) } + case "DesiredModelArn": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected ComprehendModelArn to be of type string, got %T instead", value) + } + sv.DesiredModelArn = ptr.String(jtv) + } + case "EndpointArn": if value != nil { jtv, ok := value.(string) @@ -10483,6 +10883,15 @@ func awsAwsjson11_deserializeDocumentEntityRecognizerAnnotations(v **types.Entit sv.S3Uri = ptr.String(jtv) } + case "TestS3Uri": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected S3Uri to be of type string, got %T instead", value) + } + sv.TestS3Uri = ptr.String(jtv) + } + default: _, _ = key, value @@ -10548,6 +10957,15 @@ func awsAwsjson11_deserializeDocumentEntityRecognizerDocuments(v **types.EntityR for key, value := range shape { switch key { + case "InputFormat": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected InputFormat to be of type string, got %T instead", value) + } + sv.InputFormat = types.InputFormat(jtv) + } + case "S3Uri": if value != nil { jtv, ok := value.(string) @@ -10557,6 +10975,15 @@ func awsAwsjson11_deserializeDocumentEntityRecognizerDocuments(v **types.EntityR sv.S3Uri = ptr.String(jtv) } + case "TestS3Uri": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected S3Uri to be of type string, got %T instead", value) + } + sv.TestS3Uri = ptr.String(jtv) + } + default: _, _ = key, value @@ -11113,6 +11540,15 @@ func awsAwsjson11_deserializeDocumentEntityRecognizerProperties(v **types.Entity } } + case "VersionName": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected VersionName to be of type string, got %T instead", value) + } + sv.VersionName = ptr.String(jtv) + } + case "VolumeKmsKeyId": if value != nil { jtv, ok := value.(string) @@ -11170,6 +11606,127 @@ func awsAwsjson11_deserializeDocumentEntityRecognizerPropertiesList(v *[]types.E return nil } +func awsAwsjson11_deserializeDocumentEntityRecognizerSummariesList(v *[]types.EntityRecognizerSummary, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.([]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var cv []types.EntityRecognizerSummary + if *v == nil { + cv = []types.EntityRecognizerSummary{} + } else { + cv = *v + } + + for _, value := range shape { + var col types.EntityRecognizerSummary + destAddr := &col + if err := awsAwsjson11_deserializeDocumentEntityRecognizerSummary(&destAddr, value); err != nil { + return err + } + col = *destAddr + cv = append(cv, col) + + } + *v = cv + return nil +} + +func awsAwsjson11_deserializeDocumentEntityRecognizerSummary(v **types.EntityRecognizerSummary, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.EntityRecognizerSummary + if *v == nil { + sv = &types.EntityRecognizerSummary{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "LatestVersionCreatedAt": + if value != nil { + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.LatestVersionCreatedAt = ptr.Time(smithytime.ParseEpochSeconds(f64)) + + default: + return fmt.Errorf("expected Timestamp to be a JSON Number, got %T instead", value) + + } + } + + case "LatestVersionName": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected VersionName to be of type string, got %T instead", value) + } + sv.LatestVersionName = ptr.String(jtv) + } + + case "LatestVersionStatus": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected ModelStatus to be of type string, got %T instead", value) + } + sv.LatestVersionStatus = types.ModelStatus(jtv) + } + + case "NumberOfVersions": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected Integer to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.NumberOfVersions = ptr.Int32(int32(i64)) + } + + case "RecognizerName": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected ComprehendArnName to be of type string, got %T instead", value) + } + sv.RecognizerName = ptr.String(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsAwsjson11_deserializeDocumentEntityTypesEvaluationMetrics(v **types.EntityTypesEvaluationMetrics, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -15535,6 +16092,51 @@ func awsAwsjson11_deserializeOpDocumentListDocumentClassifiersOutput(v **ListDoc return nil } +func awsAwsjson11_deserializeOpDocumentListDocumentClassifierSummariesOutput(v **ListDocumentClassifierSummariesOutput, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *ListDocumentClassifierSummariesOutput + if *v == nil { + sv = &ListDocumentClassifierSummariesOutput{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "DocumentClassifierSummariesList": + if err := awsAwsjson11_deserializeDocumentDocumentClassifierSummariesList(&sv.DocumentClassifierSummariesList, value); err != nil { + return err + } + + case "NextToken": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected String to be of type string, got %T instead", value) + } + sv.NextToken = ptr.String(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsAwsjson11_deserializeOpDocumentListDominantLanguageDetectionJobsOutput(v **ListDominantLanguageDetectionJobsOutput, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -15715,6 +16317,51 @@ func awsAwsjson11_deserializeOpDocumentListEntityRecognizersOutput(v **ListEntit return nil } +func awsAwsjson11_deserializeOpDocumentListEntityRecognizerSummariesOutput(v **ListEntityRecognizerSummariesOutput, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *ListEntityRecognizerSummariesOutput + if *v == nil { + sv = &ListEntityRecognizerSummariesOutput{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "EntityRecognizerSummariesList": + if err := awsAwsjson11_deserializeDocumentEntityRecognizerSummariesList(&sv.EntityRecognizerSummariesList, value); err != nil { + return err + } + + case "NextToken": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected String to be of type string, got %T instead", value) + } + sv.NextToken = ptr.String(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsAwsjson11_deserializeOpDocumentListEventsDetectionJobsOutput(v **ListEventsDetectionJobsOutput, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) diff --git a/service/comprehend/generated.json b/service/comprehend/generated.json index 225192b6d0f..ee494942534 100644 --- a/service/comprehend/generated.json +++ b/service/comprehend/generated.json @@ -36,10 +36,12 @@ "api_op_DetectSentiment.go", "api_op_DetectSyntax.go", "api_op_ListDocumentClassificationJobs.go", + "api_op_ListDocumentClassifierSummaries.go", "api_op_ListDocumentClassifiers.go", "api_op_ListDominantLanguageDetectionJobs.go", "api_op_ListEndpoints.go", "api_op_ListEntitiesDetectionJobs.go", + "api_op_ListEntityRecognizerSummaries.go", "api_op_ListEntityRecognizers.go", "api_op_ListEventsDetectionJobs.go", "api_op_ListKeyPhrasesDetectionJobs.go", diff --git a/service/comprehend/serializers.go b/service/comprehend/serializers.go index 480ad23fdbb..e314b76c184 100644 --- a/service/comprehend/serializers.go +++ b/service/comprehend/serializers.go @@ -1519,6 +1519,53 @@ func (m *awsAwsjson11_serializeOpListDocumentClassifiers) HandleSerialize(ctx co return next.HandleSerialize(ctx, in) } +type awsAwsjson11_serializeOpListDocumentClassifierSummaries struct { +} + +func (*awsAwsjson11_serializeOpListDocumentClassifierSummaries) ID() string { + return "OperationSerializer" +} + +func (m *awsAwsjson11_serializeOpListDocumentClassifierSummaries) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) ( + out middleware.SerializeOutput, metadata middleware.Metadata, err error, +) { + request, ok := in.Request.(*smithyhttp.Request) + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown transport type %T", in.Request)} + } + + input, ok := in.Parameters.(*ListDocumentClassifierSummariesInput) + _ = input + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown input parameters type %T", in.Parameters)} + } + + request.Request.URL.Path = "/" + request.Request.Method = "POST" + httpBindingEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + httpBindingEncoder.SetHeader("Content-Type").String("application/x-amz-json-1.1") + httpBindingEncoder.SetHeader("X-Amz-Target").String("Comprehend_20171127.ListDocumentClassifierSummaries") + + jsonEncoder := smithyjson.NewEncoder() + if err := awsAwsjson11_serializeOpDocumentListDocumentClassifierSummariesInput(input, jsonEncoder.Value); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request, err = request.SetStream(bytes.NewReader(jsonEncoder.Bytes())); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request.Request, err = httpBindingEncoder.Encode(request.Request); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + in.Request = request + + return next.HandleSerialize(ctx, in) +} + type awsAwsjson11_serializeOpListDominantLanguageDetectionJobs struct { } @@ -1707,6 +1754,53 @@ func (m *awsAwsjson11_serializeOpListEntityRecognizers) HandleSerialize(ctx cont return next.HandleSerialize(ctx, in) } +type awsAwsjson11_serializeOpListEntityRecognizerSummaries struct { +} + +func (*awsAwsjson11_serializeOpListEntityRecognizerSummaries) ID() string { + return "OperationSerializer" +} + +func (m *awsAwsjson11_serializeOpListEntityRecognizerSummaries) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) ( + out middleware.SerializeOutput, metadata middleware.Metadata, err error, +) { + request, ok := in.Request.(*smithyhttp.Request) + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown transport type %T", in.Request)} + } + + input, ok := in.Parameters.(*ListEntityRecognizerSummariesInput) + _ = input + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown input parameters type %T", in.Parameters)} + } + + request.Request.URL.Path = "/" + request.Request.Method = "POST" + httpBindingEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + httpBindingEncoder.SetHeader("Content-Type").String("application/x-amz-json-1.1") + httpBindingEncoder.SetHeader("X-Amz-Target").String("Comprehend_20171127.ListEntityRecognizerSummaries") + + jsonEncoder := smithyjson.NewEncoder() + if err := awsAwsjson11_serializeOpDocumentListEntityRecognizerSummariesInput(input, jsonEncoder.Value); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request, err = request.SetStream(bytes.NewReader(jsonEncoder.Bytes())); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request.Request, err = httpBindingEncoder.Encode(request.Request); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + in.Request = request + + return next.HandleSerialize(ctx, in) +} + type awsAwsjson11_serializeOpListEventsDetectionJobs struct { } @@ -2923,6 +3017,11 @@ func awsAwsjson11_serializeDocumentAugmentedManifestsListItem(v *types.Augmented ok.String(*v.SourceDocumentsS3Uri) } + if len(v.Split) > 0 { + ok := object.Key("Split") + ok.String(string(v.Split)) + } + return nil } @@ -2981,6 +3080,11 @@ func awsAwsjson11_serializeDocumentDocumentClassifierFilter(v *types.DocumentCla object := value.Object() defer object.Close() + if v.DocumentClassifierName != nil { + ok := object.Key("DocumentClassifierName") + ok.String(*v.DocumentClassifierName) + } + if len(v.Status) > 0 { ok := object.Key("Status") ok.String(string(v.Status)) @@ -3025,6 +3129,11 @@ func awsAwsjson11_serializeDocumentDocumentClassifierInputDataConfig(v *types.Do ok.String(*v.S3Uri) } + if v.TestS3Uri != nil { + ok := object.Key("TestS3Uri") + ok.String(*v.TestS3Uri) + } + return nil } @@ -3159,6 +3268,11 @@ func awsAwsjson11_serializeDocumentEntityRecognizerAnnotations(v *types.EntityRe ok.String(*v.S3Uri) } + if v.TestS3Uri != nil { + ok := object.Key("TestS3Uri") + ok.String(*v.TestS3Uri) + } + return nil } @@ -3179,11 +3293,21 @@ func awsAwsjson11_serializeDocumentEntityRecognizerDocuments(v *types.EntityReco object := value.Object() defer object.Close() + if len(v.InputFormat) > 0 { + ok := object.Key("InputFormat") + ok.String(string(v.InputFormat)) + } + if v.S3Uri != nil { ok := object.Key("S3Uri") ok.String(*v.S3Uri) } + if v.TestS3Uri != nil { + ok := object.Key("TestS3Uri") + ok.String(*v.TestS3Uri) + } + return nil } @@ -3203,6 +3327,11 @@ func awsAwsjson11_serializeDocumentEntityRecognizerFilter(v *types.EntityRecogni object := value.Object() defer object.Close() + if v.RecognizerName != nil { + ok := object.Key("RecognizerName") + ok.String(*v.RecognizerName) + } + if len(v.Status) > 0 { ok := object.Key("Status") ok.String(string(v.Status)) @@ -3789,6 +3918,11 @@ func awsAwsjson11_serializeOpDocumentCreateDocumentClassifierInput(v *CreateDocu } } + if v.VersionName != nil { + ok := object.Key("VersionName") + ok.String(*v.VersionName) + } + if v.VolumeKmsKeyId != nil { ok := object.Key("VolumeKmsKeyId") ok.String(*v.VolumeKmsKeyId) @@ -3886,6 +4020,11 @@ func awsAwsjson11_serializeOpDocumentCreateEntityRecognizerInput(v *CreateEntity } } + if v.VersionName != nil { + ok := object.Key("VersionName") + ok.String(*v.VersionName) + } + if v.VolumeKmsKeyId != nil { ok := object.Key("VolumeKmsKeyId") ok.String(*v.VolumeKmsKeyId) @@ -4219,6 +4358,23 @@ func awsAwsjson11_serializeOpDocumentListDocumentClassifiersInput(v *ListDocumen return nil } +func awsAwsjson11_serializeOpDocumentListDocumentClassifierSummariesInput(v *ListDocumentClassifierSummariesInput, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if v.MaxResults != nil { + ok := object.Key("MaxResults") + ok.Integer(*v.MaxResults) + } + + if v.NextToken != nil { + ok := object.Key("NextToken") + ok.String(*v.NextToken) + } + + return nil +} + func awsAwsjson11_serializeOpDocumentListDominantLanguageDetectionJobsInput(v *ListDominantLanguageDetectionJobsInput, value smithyjson.Value) error { object := value.Object() defer object.Close() @@ -4315,6 +4471,23 @@ func awsAwsjson11_serializeOpDocumentListEntityRecognizersInput(v *ListEntityRec return nil } +func awsAwsjson11_serializeOpDocumentListEntityRecognizerSummariesInput(v *ListEntityRecognizerSummariesInput, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if v.MaxResults != nil { + ok := object.Key("MaxResults") + ok.Integer(*v.MaxResults) + } + + if v.NextToken != nil { + ok := object.Key("NextToken") + ok.String(*v.NextToken) + } + + return nil +} + func awsAwsjson11_serializeOpDocumentListEventsDetectionJobsInput(v *ListEventsDetectionJobsInput, value smithyjson.Value) error { object := value.Object() defer object.Close() @@ -5060,11 +5233,21 @@ func awsAwsjson11_serializeOpDocumentUpdateEndpointInput(v *UpdateEndpointInput, object := value.Object() defer object.Close() + if v.DesiredDataAccessRoleArn != nil { + ok := object.Key("DesiredDataAccessRoleArn") + ok.String(*v.DesiredDataAccessRoleArn) + } + if v.DesiredInferenceUnits != nil { ok := object.Key("DesiredInferenceUnits") ok.Integer(*v.DesiredInferenceUnits) } + if v.DesiredModelArn != nil { + ok := object.Key("DesiredModelArn") + ok.String(*v.DesiredModelArn) + } + if v.EndpointArn != nil { ok := object.Key("EndpointArn") ok.String(*v.EndpointArn) diff --git a/service/comprehend/types/enums.go b/service/comprehend/types/enums.go index ce85d4678d2..2bdd0b1a5cd 100644 --- a/service/comprehend/types/enums.go +++ b/service/comprehend/types/enums.go @@ -463,6 +463,24 @@ func (SentimentType) Values() []SentimentType { } } +type Split string + +// Enum values for Split +const ( + SplitTrain Split = "TRAIN" + SplitTest Split = "TEST" +) + +// Values returns all known values for Split. 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 (Split) Values() []Split { + return []Split{ + "TRAIN", + "TEST", + } +} + type SyntaxLanguageCode string // Enum values for SyntaxLanguageCode diff --git a/service/comprehend/types/types.go b/service/comprehend/types/types.go index 63c4192496f..2415346ed4c 100644 --- a/service/comprehend/types/types.go +++ b/service/comprehend/types/types.go @@ -49,6 +49,14 @@ type AugmentedManifestsListItem struct { // manifest file. SourceDocumentsS3Uri *string + // The purpose of the data you've provided in the augmented manifest. You can + // either train or test this data. If you don't specify, the default is train. + // TRAIN - all of the documents in the manifest will be used for training. If no + // test documents are provided, Amazon Comprehend will automatically reserve a + // portion of the training documents for testing. TEST - all of the documents in + // the manifest will be used for testing. + Split Split + noSmithyDocumentSerde } @@ -322,6 +330,9 @@ type DocumentClassificationJobProperties struct { // operation. type DocumentClassifierFilter struct { + // The name that you assigned to the document classifier + DocumentClassifierName *string + // Filters the list of classifiers based on status. Status ModelStatus @@ -382,6 +393,11 @@ type DocumentClassifierInputDataConfig struct { // if you set DataFormat to COMPREHEND_CSV. S3Uri *string + // The Amazon S3 URI for the input data. The Amazon S3 bucket must be in the same + // AWS Region as the API endpoint that you are calling. The URI can point to a + // single input file or it can provide the prefix for a collection of input files. + TestS3Uri *string + noSmithyDocumentSerde } @@ -485,6 +501,9 @@ type DocumentClassifierProperties struct { // TrainingEndTime. TrainingStartTime *time.Time + // The version name that you assigned to the document classifier. + VersionName *string + // ID for the AWS Key Management Service (KMS) key that Amazon Comprehend uses to // encrypt data on the storage volume attached to the ML compute instance(s) that // process the analysis job. The VolumeKmsKeyId can be either of the following @@ -506,6 +525,28 @@ type DocumentClassifierProperties struct { noSmithyDocumentSerde } +// Describes information about a document classifier and its versions. +type DocumentClassifierSummary struct { + + // The name that you assigned the document classifier. + DocumentClassifierName *string + + // The time that the latest document classifier version was submitted for + // processing. + LatestVersionCreatedAt *time.Time + + // The version name you assigned to the latest document classifier version. + LatestVersionName *string + + // Provides the status of the latest document classifier version. + LatestVersionStatus ModelStatus + + // The number of versions you created. + NumberOfVersions *int32 + + noSmithyDocumentSerde +} + // Specifies one of the label or labels that categorize the document being // analyzed. type DocumentLabel struct { @@ -688,11 +729,19 @@ type EndpointProperties struct { // encrypted with a customer managed key (ModelKmsKeyId). DataAccessRoleArn *string + // Data access role ARN to use in case the new model is encrypted with a customer + // KMS key. + DesiredDataAccessRoleArn *string + // The desired number of inference units to be used by the model using this // endpoint. Each inference unit represents of a throughput of 100 characters per // second. DesiredInferenceUnits *int32 + // ARN of the new model to use for updating an existing endpoint. This ARN is going + // to be different from the model ARN when the update is in progress + DesiredModelArn *string + // The Amazon Resource Number (ARN) of the endpoint. EndpointArn *string @@ -858,6 +907,11 @@ type EntityRecognizerAnnotations struct { // This member is required. S3Uri *string + // This specifies the Amazon S3 location where the test annotations for an entity + // recognizer are located. The URI must be in the same AWS Region as the API + // endpoint that you are calling. + TestS3Uri *string + noSmithyDocumentSerde } @@ -871,6 +925,19 @@ type EntityRecognizerDocuments struct { // This member is required. S3Uri *string + // Specifies how the text in an input file should be processed. This is optional, + // and the default is ONE_DOC_PER_LINE. ONE_DOC_PER_FILE - Each file is considered + // a separate document. Use this option when you are processing large documents, + // such as newspaper articles or scientific papers. ONE_DOC_PER_LINE - Each line in + // a file is considered a separate document. Use this option when you are + // processing many short documents, such as text messages. + InputFormat InputFormat + + // Specifies the Amazon S3 location where the test documents for an entity + // recognizer are located. The URI must be in the same AWS Region as the API + // endpoint that you are calling. + TestS3Uri *string + noSmithyDocumentSerde } @@ -911,6 +978,9 @@ type EntityRecognizerEvaluationMetrics struct { // operation./> type EntityRecognizerFilter struct { + // The name that you assigned the entity recognizer. + RecognizerName *string + // The status of an entity recognizer. Status ModelStatus @@ -1069,6 +1139,9 @@ type EntityRecognizerProperties struct { // The time that training of the entity recognizer started. TrainingStartTime *time.Time + // The version name you assigned to the entity recognizer. + VersionName *string + // ID for the AWS Key Management Service (KMS) key that Amazon Comprehend uses to // encrypt data on the storage volume attached to the ML compute instance(s) that // process the analysis job. The VolumeKmsKeyId can be either of the following @@ -1090,6 +1163,27 @@ type EntityRecognizerProperties struct { noSmithyDocumentSerde } +// Describes the information about an entity recognizer and its versions. +type EntityRecognizerSummary struct { + + // The time that the latest entity recognizer version was submitted for processing. + LatestVersionCreatedAt *time.Time + + // The version name you assigned to the latest entity recognizer version. + LatestVersionName *string + + // Provides the status of the latest entity recognizer version. + LatestVersionStatus ModelStatus + + // The number of versions you created. + NumberOfVersions *int32 + + // The name that you assigned the entity recognizer. + RecognizerName *string + + noSmithyDocumentSerde +} + // Detailed information about the accuracy of an entity recognizer for a specific // entity type. type EntityTypesEvaluationMetrics struct { diff --git a/service/comprehend/validators.go b/service/comprehend/validators.go index a21a3d16ca9..42993209d31 100644 --- a/service/comprehend/validators.go +++ b/service/comprehend/validators.go @@ -2541,9 +2541,6 @@ func validateOpUpdateEndpointInput(v *UpdateEndpointInput) error { if v.EndpointArn == nil { invalidParams.Add(smithy.NewErrParamRequired("EndpointArn")) } - if v.DesiredInferenceUnits == nil { - invalidParams.Add(smithy.NewErrParamRequired("DesiredInferenceUnits")) - } if invalidParams.Len() > 0 { return invalidParams } else { diff --git a/service/databasemigrationservice/api_op_ApplyPendingMaintenanceAction.go b/service/databasemigrationservice/api_op_ApplyPendingMaintenanceAction.go index 4db843ee9d8..58fe02f716f 100644 --- a/service/databasemigrationservice/api_op_ApplyPendingMaintenanceAction.go +++ b/service/databasemigrationservice/api_op_ApplyPendingMaintenanceAction.go @@ -31,7 +31,8 @@ func (c *Client) ApplyPendingMaintenanceAction(ctx context.Context, params *Appl // type ApplyPendingMaintenanceActionInput struct { - // The pending maintenance action to apply to this resource. + // The pending maintenance action to apply to this resource. Valid values: + // os-upgrade, system-update, db-upgrade // // This member is required. ApplyAction *string diff --git a/service/databasemigrationservice/api_op_CreateEndpoint.go b/service/databasemigrationservice/api_op_CreateEndpoint.go index 5b7aaf57666..4296ce69a57 100644 --- a/service/databasemigrationservice/api_op_CreateEndpoint.go +++ b/service/databasemigrationservice/api_op_CreateEndpoint.go @@ -66,8 +66,8 @@ type CreateEndpointInput struct { // The settings in JSON format for the DMS transfer type of source endpoint. // Possible settings include the following: // - // * ServiceAccessRoleArn - The IAM role - // that has permission to access the Amazon S3 bucket. The role must allow the + // * ServiceAccessRoleArn - The Amazon + // Resource Name (ARN) used by the service access IAM role. The role must allow the // iam:PassRole action. // // * BucketName - The name of the S3 bucket to diff --git a/service/databasemigrationservice/api_op_CreateReplicationSubnetGroup.go b/service/databasemigrationservice/api_op_CreateReplicationSubnetGroup.go index 3c1e0c70646..fb283ded5b9 100644 --- a/service/databasemigrationservice/api_op_CreateReplicationSubnetGroup.go +++ b/service/databasemigrationservice/api_op_CreateReplicationSubnetGroup.go @@ -11,7 +11,10 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Creates a replication subnet group given a list of the subnet IDs in a VPC. +// Creates a replication subnet group given a list of the subnet IDs in a VPC. The +// VPC needs to have at least one subnet in at least two availability zones in the +// Amazon Web Services Region, otherwise the service will throw a +// ReplicationSubnetGroupDoesNotCoverEnoughAZs exception. func (c *Client) CreateReplicationSubnetGroup(ctx context.Context, params *CreateReplicationSubnetGroupInput, optFns ...func(*Options)) (*CreateReplicationSubnetGroupOutput, error) { if params == nil { params = &CreateReplicationSubnetGroupInput{} diff --git a/service/databasemigrationservice/api_op_ModifyEndpoint.go b/service/databasemigrationservice/api_op_ModifyEndpoint.go index 9942a20c5a1..33bd6ebe3c9 100644 --- a/service/databasemigrationservice/api_op_ModifyEndpoint.go +++ b/service/databasemigrationservice/api_op_ModifyEndpoint.go @@ -50,12 +50,12 @@ type ModifyEndpointInput struct { // The settings in JSON format for the DMS transfer type of source endpoint. // Attributes include the following: // - // * serviceAccessRoleArn - The Identity and - // Access Management (IAM) role that has permission to access the Amazon S3 bucket. - // The role must allow the iam:PassRole action. + // * serviceAccessRoleArn - The Amazon Resource + // Name (ARN) used by the service access IAM role. The role must allow the + // iam:PassRole action. // - // * BucketName - The name of the S3 - // bucket to use. + // * BucketName - The name of the S3 bucket to + // use. // // Shorthand syntax for these settings is as follows: // ServiceAccessRoleArn=string ,BucketName=string JSON syntax for these settings is diff --git a/service/databasemigrationservice/api_op_RebootReplicationInstance.go b/service/databasemigrationservice/api_op_RebootReplicationInstance.go index 82b33ed08ea..50efe0e277a 100644 --- a/service/databasemigrationservice/api_op_RebootReplicationInstance.go +++ b/service/databasemigrationservice/api_op_RebootReplicationInstance.go @@ -36,9 +36,17 @@ type RebootReplicationInstanceInput struct { ReplicationInstanceArn *string // If this parameter is true, the reboot is conducted through a Multi-AZ failover. - // (If the instance isn't configured for Multi-AZ, then you can't specify true.) + // If the instance isn't configured for Multi-AZ, then you can't specify true. ( + // --force-planned-failover and --force-failover can't both be set to true.) ForceFailover *bool + // If this parameter is true, the reboot is conducted through a planned Multi-AZ + // failover where resources are released and cleaned up prior to conducting the + // failover. If the instance isn''t configured for Multi-AZ, then you can't specify + // true. ( --force-planned-failover and --force-failover can't both be set to + // true.) + ForcePlannedFailover *bool + noSmithyDocumentSerde } diff --git a/service/databasemigrationservice/api_op_ReloadTables.go b/service/databasemigrationservice/api_op_ReloadTables.go index d010395beac..745f8a61cfe 100644 --- a/service/databasemigrationservice/api_op_ReloadTables.go +++ b/service/databasemigrationservice/api_op_ReloadTables.go @@ -11,7 +11,9 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Reloads the target database table with the source data. +// Reloads the target database table with the source data. You can only use this +// operation with a task in the RUNNING state, otherwise the service will throw an +// InvalidResourceStateFault exception. func (c *Client) ReloadTables(ctx context.Context, params *ReloadTablesInput, optFns ...func(*Options)) (*ReloadTablesOutput, error) { if params == nil { params = &ReloadTablesInput{} diff --git a/service/databasemigrationservice/serializers.go b/service/databasemigrationservice/serializers.go index 7d80b04bea2..e1df33b1e5a 100644 --- a/service/databasemigrationservice/serializers.go +++ b/service/databasemigrationservice/serializers.go @@ -5741,6 +5741,11 @@ func awsAwsjson11_serializeOpDocumentRebootReplicationInstanceInput(v *RebootRep ok.Boolean(*v.ForceFailover) } + if v.ForcePlannedFailover != nil { + ok := object.Key("ForcePlannedFailover") + ok.Boolean(*v.ForcePlannedFailover) + } + if v.ReplicationInstanceArn != nil { ok := object.Key("ReplicationInstanceArn") ok.String(*v.ReplicationInstanceArn) diff --git a/service/databasemigrationservice/types/types.go b/service/databasemigrationservice/types/types.go index d411752bd0e..e0bb99b7b89 100644 --- a/service/databasemigrationservice/types/types.go +++ b/service/databasemigrationservice/types/types.go @@ -119,9 +119,8 @@ type DmsTransferSettings struct { // The name of the S3 bucket to use. BucketName *string - // The IAM role that has permission to access the Amazon S3 bucket. When specified - // as part of request syntax, such as for the CreateEndpoint and ModifyEndpoint - // actions, the role must allow the iam:PassRole action. + // The Amazon Resource Name (ARN) used by the service access IAM role. The role + // must allow the iam:PassRole action. ServiceAccessRoleArn *string noSmithyDocumentSerde @@ -249,8 +248,8 @@ type Endpoint struct { // The settings in JSON format for the DMS transfer type of source endpoint. // Possible settings include the following: // - // * ServiceAccessRoleArn - The IAM role - // that has permission to access the Amazon S3 bucket. The role must allow the + // * ServiceAccessRoleArn - - The Amazon + // Resource Name (ARN) used by the service access IAM role. The role must allow the // iam:PassRole action. // // * BucketName - The name of the S3 bucket to diff --git a/service/ec2/api_op_AssociateClientVpnTargetNetwork.go b/service/ec2/api_op_AssociateClientVpnTargetNetwork.go index 45589642a93..25518d73faa 100644 --- a/service/ec2/api_op_AssociateClientVpnTargetNetwork.go +++ b/service/ec2/api_op_AssociateClientVpnTargetNetwork.go @@ -49,7 +49,7 @@ type AssociateClientVpnTargetNetworkInput struct { SubnetId *string // Unique, case-sensitive identifier that you provide to ensure the idempotency of - // the request. For more information, see How to Ensure Idempotency + // the request. For more information, see How to ensure idempotency // (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html). ClientToken *string diff --git a/service/ec2/api_op_AttachVpnGateway.go b/service/ec2/api_op_AttachVpnGateway.go index c776d7e1371..25e94082efe 100644 --- a/service/ec2/api_op_AttachVpnGateway.go +++ b/service/ec2/api_op_AttachVpnGateway.go @@ -12,9 +12,9 @@ import ( ) // Attaches a virtual private gateway to a VPC. You can attach one virtual private -// gateway to one VPC at a time. For more information, see AWS Site-to-Site VPN -// (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in the AWS -// Site-to-Site VPN User Guide. +// gateway to one VPC at a time. For more information, see Amazon Web Services +// Site-to-Site VPN (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in +// the Amazon Web Services Site-to-Site VPN User Guide. func (c *Client) AttachVpnGateway(ctx context.Context, params *AttachVpnGatewayInput, optFns ...func(*Options)) (*AttachVpnGatewayOutput, error) { if params == nil { params = &AttachVpnGatewayInput{} diff --git a/service/ec2/api_op_AuthorizeClientVpnIngress.go b/service/ec2/api_op_AuthorizeClientVpnIngress.go index f749406ec30..01a5d8a5fc4 100644 --- a/service/ec2/api_op_AuthorizeClientVpnIngress.go +++ b/service/ec2/api_op_AuthorizeClientVpnIngress.go @@ -15,7 +15,7 @@ import ( // Adds an ingress authorization rule to a Client VPN endpoint. Ingress // authorization rules act as firewall rules that grant access to networks. You // must configure ingress authorization rules to enable clients to access resources -// in AWS or on-premises networks. +// in Amazon Web Services or on-premises networks. func (c *Client) AuthorizeClientVpnIngress(ctx context.Context, params *AuthorizeClientVpnIngressInput, optFns ...func(*Options)) (*AuthorizeClientVpnIngressOutput, error) { if params == nil { params = &AuthorizeClientVpnIngressInput{} @@ -55,7 +55,7 @@ type AuthorizeClientVpnIngressInput struct { AuthorizeAllGroups *bool // Unique, case-sensitive identifier that you provide to ensure the idempotency of - // the request. For more information, see How to Ensure Idempotency + // the request. For more information, see How to ensure idempotency // (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html). ClientToken *string diff --git a/service/ec2/api_op_CreateClientVpnEndpoint.go b/service/ec2/api_op_CreateClientVpnEndpoint.go index 176d9861788..6494cdc7d0d 100644 --- a/service/ec2/api_op_CreateClientVpnEndpoint.go +++ b/service/ec2/api_op_CreateClientVpnEndpoint.go @@ -64,7 +64,7 @@ type CreateClientVpnEndpointInput struct { // This member is required. ConnectionLogOptions *types.ConnectionLogOptions - // The ARN of the server certificate. For more information, see the AWS Certificate + // The ARN of the server certificate. For more information, see the Certificate // Manager User Guide (https://docs.aws.amazon.com/acm/latest/userguide/). // // This member is required. @@ -74,7 +74,7 @@ type CreateClientVpnEndpointInput struct { ClientConnectOptions *types.ClientConnectOptions // Unique, case-sensitive identifier that you provide to ensure the idempotency of - // the request. For more information, see How to Ensure Idempotency + // the request. For more information, see How to ensure idempotency // (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html). ClientToken *string @@ -100,11 +100,11 @@ type CreateClientVpnEndpointInput struct { // Default Value: enabled SelfServicePortal types.SelfServicePortal - // Indicates whether split-tunnel is enabled on the AWS Client VPN endpoint. By + // Indicates whether split-tunnel is enabled on the Client VPN endpoint. By // default, split-tunnel on a VPN endpoint is disabled. For information about - // split-tunnel VPN endpoints, see Split-Tunnel AWS Client VPN Endpoint + // split-tunnel VPN endpoints, see Split-tunnel Client VPN endpoint // (https://docs.aws.amazon.com/vpn/latest/clientvpn-admin/split-tunnel-vpn.html) - // in the AWS Client VPN Administrator Guide. + // in the Client VPN Administrator Guide. SplitTunnel *bool // The tags to apply to the Client VPN endpoint during creation. diff --git a/service/ec2/api_op_CreateClientVpnRoute.go b/service/ec2/api_op_CreateClientVpnRoute.go index e74de5336ab..f933eeea685 100644 --- a/service/ec2/api_op_CreateClientVpnRoute.go +++ b/service/ec2/api_op_CreateClientVpnRoute.go @@ -47,10 +47,11 @@ type CreateClientVpnRouteInput struct { // route for a peered VPC, enter the peered VPC's IPv4 CIDR range // // * To add a route - // for an on-premises network, enter the AWS Site-to-Site VPN connection's IPv4 - // CIDR range + // for an on-premises network, enter the Amazon Web Services Site-to-Site VPN + // connection's IPv4 CIDR range // - // * To add a route for the local network, enter the client CIDR range + // * To add a route for the local network, enter the + // client CIDR range // // This member is required. DestinationCidrBlock *string @@ -63,7 +64,7 @@ type CreateClientVpnRouteInput struct { TargetVpcSubnetId *string // Unique, case-sensitive identifier that you provide to ensure the idempotency of - // the request. For more information, see How to Ensure Idempotency + // the request. For more information, see How to ensure idempotency // (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html). ClientToken *string diff --git a/service/ec2/api_op_CreateCustomerGateway.go b/service/ec2/api_op_CreateCustomerGateway.go index de44333331d..fa162da0dd3 100644 --- a/service/ec2/api_op_CreateCustomerGateway.go +++ b/service/ec2/api_op_CreateCustomerGateway.go @@ -11,31 +11,32 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Provides information to AWS about your VPN customer gateway device. The customer -// gateway is the appliance at your end of the VPN connection. (The device on the -// AWS side of the VPN connection is the virtual private gateway.) You must provide -// the internet-routable IP address of the customer gateway's external interface. -// The IP address must be static and can be behind a device performing network -// address translation (NAT). For devices that use Border Gateway Protocol (BGP), -// you can also provide the device's BGP Autonomous System Number (ASN). You can -// use an existing ASN assigned to your network. If you don't have an ASN already, -// you can use a private ASN (in the 64512 - 65534 range). Amazon EC2 supports all -// 4-byte ASN numbers in the range of 1 - 2147483647, with the exception of the -// following: +// Provides information to Amazon Web Services about your VPN customer gateway +// device. The customer gateway is the appliance at your end of the VPN connection. +// (The device on the Amazon Web Services side of the VPN connection is the virtual +// private gateway.) You must provide the internet-routable IP address of the +// customer gateway's external interface. The IP address must be static and can be +// behind a device performing network address translation (NAT). For devices that +// use Border Gateway Protocol (BGP), you can also provide the device's BGP +// Autonomous System Number (ASN). You can use an existing ASN assigned to your +// network. If you don't have an ASN already, you can use a private ASN (in the +// 64512 - 65534 range). Amazon EC2 supports all 4-byte ASN numbers in the range of +// 1 - 2147483647, with the exception of the following: // -// * 7224 - reserved in the us-east-1 Region +// * 7224 - reserved in the +// us-east-1 Region // -// * 9059 - reserved in the -// eu-west-1 Region +// * 9059 - reserved in the eu-west-1 Region // -// * 17943 - reserved in the ap-southeast-1 Region +// * 17943 - reserved +// in the ap-southeast-1 Region // -// * 10124 - -// reserved in the ap-northeast-1 Region +// * 10124 - reserved in the ap-northeast-1 +// Region // -// For more information, see AWS -// Site-to-Site VPN (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in -// the AWS Site-to-Site VPN User Guide. To create more than one customer gateway +// For more information, see Amazon Web Services Site-to-Site VPN +// (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in the Amazon Web +// Services Site-to-Site VPN User Guide. To create more than one customer gateway // with the same VPN type, IP address, and BGP ASN, specify a unique device name // for each customer gateway. Identical requests return information about the // existing customer gateway and do not create new customer gateways. diff --git a/service/ec2/api_op_CreateVpnConnection.go b/service/ec2/api_op_CreateVpnConnection.go index fe68c66cf1a..a7e2192fcf3 100644 --- a/service/ec2/api_op_CreateVpnConnection.go +++ b/service/ec2/api_op_CreateVpnConnection.go @@ -21,9 +21,9 @@ import ( // VPN connection, you must reconfigure your customer gateway with the new // information returned from this call. This is an idempotent operation. If you // perform the operation more than once, Amazon EC2 doesn't return an error. For -// more information, see AWS Site-to-Site VPN -// (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in the AWS -// Site-to-Site VPN User Guide. +// more information, see Amazon Web Services Site-to-Site VPN +// (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in the Amazon Web +// Services Site-to-Site VPN User Guide. func (c *Client) CreateVpnConnection(ctx context.Context, params *CreateVpnConnectionInput, optFns ...func(*Options)) (*CreateVpnConnectionOutput, error) { if params == nil { params = &CreateVpnConnectionInput{} diff --git a/service/ec2/api_op_CreateVpnConnectionRoute.go b/service/ec2/api_op_CreateVpnConnectionRoute.go index 8b7e9553d46..fce5cf69989 100644 --- a/service/ec2/api_op_CreateVpnConnectionRoute.go +++ b/service/ec2/api_op_CreateVpnConnectionRoute.go @@ -13,9 +13,9 @@ import ( // Creates a static route associated with a VPN connection between an existing // virtual private gateway and a VPN customer gateway. The static route allows // traffic to be routed from the virtual private gateway to the VPN customer -// gateway. For more information, see AWS Site-to-Site VPN -// (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in the AWS -// Site-to-Site VPN User Guide. +// gateway. For more information, see Amazon Web Services Site-to-Site VPN +// (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in the Amazon Web +// Services Site-to-Site VPN User Guide. func (c *Client) CreateVpnConnectionRoute(ctx context.Context, params *CreateVpnConnectionRouteInput, optFns ...func(*Options)) (*CreateVpnConnectionRouteOutput, error) { if params == nil { params = &CreateVpnConnectionRouteInput{} diff --git a/service/ec2/api_op_CreateVpnGateway.go b/service/ec2/api_op_CreateVpnGateway.go index 679c2e21fbc..0dd581267e1 100644 --- a/service/ec2/api_op_CreateVpnGateway.go +++ b/service/ec2/api_op_CreateVpnGateway.go @@ -13,9 +13,9 @@ import ( // Creates a virtual private gateway. A virtual private gateway is the endpoint on // the VPC side of your VPN connection. You can create a virtual private gateway -// before creating the VPC itself. For more information, see AWS Site-to-Site VPN -// (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in the AWS -// Site-to-Site VPN User Guide. +// before creating the VPC itself. For more information, see Amazon Web Services +// Site-to-Site VPN (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in +// the Amazon Web Services Site-to-Site VPN User Guide. func (c *Client) CreateVpnGateway(ctx context.Context, params *CreateVpnGatewayInput, optFns ...func(*Options)) (*CreateVpnGatewayOutput, error) { if params == nil { params = &CreateVpnGatewayInput{} diff --git a/service/ec2/api_op_DeleteVpnConnection.go b/service/ec2/api_op_DeleteVpnConnection.go index 9232bb1f9b7..89702e4d663 100644 --- a/service/ec2/api_op_DeleteVpnConnection.go +++ b/service/ec2/api_op_DeleteVpnConnection.go @@ -18,9 +18,9 @@ import ( // keys, without needing to delete the VPC or virtual private gateway. If you // create a new VPN connection, you must reconfigure the customer gateway device // using the new configuration information returned with the new VPN connection ID. -// For certificate-based authentication, delete all AWS Certificate Manager (ACM) -// private certificates used for the AWS-side tunnel endpoints for the VPN -// connection before deleting the VPN connection. +// For certificate-based authentication, delete all Certificate Manager (ACM) +// private certificates used for the Amazon Web Services-side tunnel endpoints for +// the VPN connection before deleting the VPN connection. func (c *Client) DeleteVpnConnection(ctx context.Context, params *DeleteVpnConnectionInput, optFns ...func(*Options)) (*DeleteVpnConnectionOutput, error) { if params == nil { params = &DeleteVpnConnectionInput{} diff --git a/service/ec2/api_op_DescribeCustomerGateways.go b/service/ec2/api_op_DescribeCustomerGateways.go index c005290ab34..a33c51b0fb7 100644 --- a/service/ec2/api_op_DescribeCustomerGateways.go +++ b/service/ec2/api_op_DescribeCustomerGateways.go @@ -17,9 +17,9 @@ import ( ) // Describes one or more of your VPN customer gateways. For more information, see -// AWS Site-to-Site VPN -// (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in the AWS -// Site-to-Site VPN User Guide. +// Amazon Web Services Site-to-Site VPN +// (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in the Amazon Web +// Services Site-to-Site VPN User Guide. func (c *Client) DescribeCustomerGateways(ctx context.Context, params *DescribeCustomerGatewaysInput, optFns ...func(*Options)) (*DescribeCustomerGatewaysOutput, error) { if params == nil { params = &DescribeCustomerGatewaysInput{} diff --git a/service/ec2/api_op_DescribeVpnConnections.go b/service/ec2/api_op_DescribeVpnConnections.go index 0910ab138b9..0411e7ab8fb 100644 --- a/service/ec2/api_op_DescribeVpnConnections.go +++ b/service/ec2/api_op_DescribeVpnConnections.go @@ -16,9 +16,10 @@ import ( "time" ) -// Describes one or more of your VPN connections. For more information, see AWS -// Site-to-Site VPN (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in -// the AWS Site-to-Site VPN User Guide. +// Describes one or more of your VPN connections. For more information, see Amazon +// Web Services Site-to-Site VPN +// (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in the Amazon Web +// Services Site-to-Site VPN User Guide. func (c *Client) DescribeVpnConnections(ctx context.Context, params *DescribeVpnConnectionsInput, optFns ...func(*Options)) (*DescribeVpnConnectionsOutput, error) { if params == nil { params = &DescribeVpnConnectionsInput{} diff --git a/service/ec2/api_op_DescribeVpnGateways.go b/service/ec2/api_op_DescribeVpnGateways.go index 012bccb7963..e284a64147a 100644 --- a/service/ec2/api_op_DescribeVpnGateways.go +++ b/service/ec2/api_op_DescribeVpnGateways.go @@ -12,9 +12,9 @@ import ( ) // Describes one or more of your virtual private gateways. For more information, -// see AWS Site-to-Site VPN -// (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in the AWS -// Site-to-Site VPN User Guide. +// see Amazon Web Services Site-to-Site VPN +// (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html) in the Amazon Web +// Services Site-to-Site VPN User Guide. func (c *Client) DescribeVpnGateways(ctx context.Context, params *DescribeVpnGatewaysInput, optFns ...func(*Options)) (*DescribeVpnGatewaysOutput, error) { if params == nil { params = &DescribeVpnGatewaysInput{} diff --git a/service/ec2/api_op_GetVpnConnectionDeviceSampleConfiguration.go b/service/ec2/api_op_GetVpnConnectionDeviceSampleConfiguration.go new file mode 100644 index 00000000000..863d6882991 --- /dev/null +++ b/service/ec2/api_op_GetVpnConnectionDeviceSampleConfiguration.go @@ -0,0 +1,137 @@ +// Code generated by smithy-go-codegen DO NOT EDIT. + +package ec2 + +import ( + "context" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/aws/signer/v4" + "github.com/aws/smithy-go/middleware" + smithyhttp "github.com/aws/smithy-go/transport/http" +) + +// Download an AWS-provided sample configuration file to be used with the customer +// gateway device specified for your Site-to-Site VPN connection. +func (c *Client) GetVpnConnectionDeviceSampleConfiguration(ctx context.Context, params *GetVpnConnectionDeviceSampleConfigurationInput, optFns ...func(*Options)) (*GetVpnConnectionDeviceSampleConfigurationOutput, error) { + if params == nil { + params = &GetVpnConnectionDeviceSampleConfigurationInput{} + } + + result, metadata, err := c.invokeOperation(ctx, "GetVpnConnectionDeviceSampleConfiguration", params, optFns, c.addOperationGetVpnConnectionDeviceSampleConfigurationMiddlewares) + if err != nil { + return nil, err + } + + out := result.(*GetVpnConnectionDeviceSampleConfigurationOutput) + out.ResultMetadata = metadata + return out, nil +} + +type GetVpnConnectionDeviceSampleConfigurationInput struct { + + // Device identifier provided by the GetVpnConnectionDeviceTypes API. + // + // This member is required. + VpnConnectionDeviceTypeId *string + + // The VpnConnectionId specifies the Site-to-Site VPN connection used for the + // sample configuration. + // + // This member is required. + VpnConnectionId *string + + // Checks whether you have the required permissions for the action, without + // actually making the request, and provides an error response. If you have the + // required permissions, the error response is DryRunOperation. Otherwise, it is + // UnauthorizedOperation. + DryRun *bool + + // The IKE version to be used in the sample configuration file for your customer + // gateway device. You can specify one of the following versions: ikev1 or ikev2. + InternetKeyExchangeVersion *string + + noSmithyDocumentSerde +} + +type GetVpnConnectionDeviceSampleConfigurationOutput struct { + + // Sample configuration file for the specified customer gateway device. + VpnConnectionDeviceSampleConfiguration *string + + // Metadata pertaining to the operation's result. + ResultMetadata middleware.Metadata + + noSmithyDocumentSerde +} + +func (c *Client) addOperationGetVpnConnectionDeviceSampleConfigurationMiddlewares(stack *middleware.Stack, options Options) (err error) { + err = stack.Serialize.Add(&awsEc2query_serializeOpGetVpnConnectionDeviceSampleConfiguration{}, middleware.After) + if err != nil { + return err + } + err = stack.Deserialize.Add(&awsEc2query_deserializeOpGetVpnConnectionDeviceSampleConfiguration{}, middleware.After) + if err != nil { + return err + } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddComputeContentLengthMiddleware(stack); err != nil { + return err + } + if err = addResolveEndpointMiddleware(stack, options); err != nil { + return err + } + if err = v4.AddComputePayloadSHA256Middleware(stack); err != nil { + return err + } + if err = addRetryMiddlewares(stack, options); err != nil { + return err + } + if err = addHTTPSignerV4Middleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddRawResponseToMetadata(stack); err != nil { + return err + } + if err = awsmiddleware.AddRecordResponseTiming(stack); err != nil { + return err + } + if err = addClientUserAgent(stack); err != nil { + return err + } + if err = smithyhttp.AddErrorCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = addOpGetVpnConnectionDeviceSampleConfigurationValidationMiddleware(stack); err != nil { + return err + } + if err = stack.Initialize.Add(newServiceMetadataMiddleware_opGetVpnConnectionDeviceSampleConfiguration(options.Region), middleware.Before); err != nil { + return err + } + if err = addRequestIDRetrieverMiddleware(stack); err != nil { + return err + } + if err = addResponseErrorMiddleware(stack); err != nil { + return err + } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } + return nil +} + +func newServiceMetadataMiddleware_opGetVpnConnectionDeviceSampleConfiguration(region string) *awsmiddleware.RegisterServiceMetadata { + return &awsmiddleware.RegisterServiceMetadata{ + Region: region, + ServiceID: ServiceID, + SigningName: "ec2", + OperationName: "GetVpnConnectionDeviceSampleConfiguration", + } +} diff --git a/service/ec2/api_op_GetVpnConnectionDeviceTypes.go b/service/ec2/api_op_GetVpnConnectionDeviceTypes.go new file mode 100644 index 00000000000..0bb501b8897 --- /dev/null +++ b/service/ec2/api_op_GetVpnConnectionDeviceTypes.go @@ -0,0 +1,243 @@ +// Code generated by smithy-go-codegen DO NOT EDIT. + +package ec2 + +import ( + "context" + "fmt" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/aws/signer/v4" + "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/aws/smithy-go/middleware" + smithyhttp "github.com/aws/smithy-go/transport/http" +) + +// Obtain a list of customer gateway devices for which sample configuration files +// can be provided. The request has no additional parameters. You can also see the +// list of device types with sample configuration files available under Your +// customer gateway device +// (https://docs.aws.amazon.com/vpn/latest/s2svpn/your-cgw.html) in the Amazon Web +// Services Site-to-Site VPN User Guide. +func (c *Client) GetVpnConnectionDeviceTypes(ctx context.Context, params *GetVpnConnectionDeviceTypesInput, optFns ...func(*Options)) (*GetVpnConnectionDeviceTypesOutput, error) { + if params == nil { + params = &GetVpnConnectionDeviceTypesInput{} + } + + result, metadata, err := c.invokeOperation(ctx, "GetVpnConnectionDeviceTypes", params, optFns, c.addOperationGetVpnConnectionDeviceTypesMiddlewares) + if err != nil { + return nil, err + } + + out := result.(*GetVpnConnectionDeviceTypesOutput) + out.ResultMetadata = metadata + return out, nil +} + +type GetVpnConnectionDeviceTypesInput struct { + + // Checks whether you have the required permissions for the action, without + // actually making the request, and provides an error response. If you have the + // required permissions, the error response is DryRunOperation. Otherwise, it is + // UnauthorizedOperation. + DryRun *bool + + // The maximum number of results returned by GetVpnConnectionDeviceTypes in + // paginated output. When this parameter is used, GetVpnConnectionDeviceTypes only + // returns MaxResults results in a single page along with a NextToken response + // element. The remaining results of the initial request can be seen by sending + // another GetVpnConnectionDeviceTypes request with the returned NextToken value. + // This value can be between 200 and 1000. If this parameter is not used, then + // GetVpnConnectionDeviceTypes returns all results. + MaxResults *int32 + + // The NextToken value returned from a previous paginated + // GetVpnConnectionDeviceTypes request where MaxResults was used and the results + // exceeded the value of that parameter. Pagination continues from the end of the + // previous results that returned the NextToken value. This value is null when + // there are no more results to return. + NextToken *string + + noSmithyDocumentSerde +} + +type GetVpnConnectionDeviceTypesOutput struct { + + // The NextToken value to include in a future GetVpnConnectionDeviceTypes request. + // When the results of a GetVpnConnectionDeviceTypes request exceed MaxResults, + // this value can be used to retrieve the next page of results. This value is null + // when there are no more results to return. + NextToken *string + + // List of customer gateway devices that have a sample configuration file available + // for use. + VpnConnectionDeviceTypes []types.VpnConnectionDeviceType + + // Metadata pertaining to the operation's result. + ResultMetadata middleware.Metadata + + noSmithyDocumentSerde +} + +func (c *Client) addOperationGetVpnConnectionDeviceTypesMiddlewares(stack *middleware.Stack, options Options) (err error) { + err = stack.Serialize.Add(&awsEc2query_serializeOpGetVpnConnectionDeviceTypes{}, middleware.After) + if err != nil { + return err + } + err = stack.Deserialize.Add(&awsEc2query_deserializeOpGetVpnConnectionDeviceTypes{}, middleware.After) + if err != nil { + return err + } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddComputeContentLengthMiddleware(stack); err != nil { + return err + } + if err = addResolveEndpointMiddleware(stack, options); err != nil { + return err + } + if err = v4.AddComputePayloadSHA256Middleware(stack); err != nil { + return err + } + if err = addRetryMiddlewares(stack, options); err != nil { + return err + } + if err = addHTTPSignerV4Middleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddRawResponseToMetadata(stack); err != nil { + return err + } + if err = awsmiddleware.AddRecordResponseTiming(stack); err != nil { + return err + } + if err = addClientUserAgent(stack); err != nil { + return err + } + if err = smithyhttp.AddErrorCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = stack.Initialize.Add(newServiceMetadataMiddleware_opGetVpnConnectionDeviceTypes(options.Region), middleware.Before); err != nil { + return err + } + if err = addRequestIDRetrieverMiddleware(stack); err != nil { + return err + } + if err = addResponseErrorMiddleware(stack); err != nil { + return err + } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } + return nil +} + +// GetVpnConnectionDeviceTypesAPIClient is a client that implements the +// GetVpnConnectionDeviceTypes operation. +type GetVpnConnectionDeviceTypesAPIClient interface { + GetVpnConnectionDeviceTypes(context.Context, *GetVpnConnectionDeviceTypesInput, ...func(*Options)) (*GetVpnConnectionDeviceTypesOutput, error) +} + +var _ GetVpnConnectionDeviceTypesAPIClient = (*Client)(nil) + +// GetVpnConnectionDeviceTypesPaginatorOptions is the paginator options for +// GetVpnConnectionDeviceTypes +type GetVpnConnectionDeviceTypesPaginatorOptions struct { + // The maximum number of results returned by GetVpnConnectionDeviceTypes in + // paginated output. When this parameter is used, GetVpnConnectionDeviceTypes only + // returns MaxResults results in a single page along with a NextToken response + // element. The remaining results of the initial request can be seen by sending + // another GetVpnConnectionDeviceTypes request with the returned NextToken value. + // This value can be between 200 and 1000. If this parameter is not used, then + // GetVpnConnectionDeviceTypes returns all results. + Limit int32 + + // Set to true if pagination should stop if the service returns a pagination token + // that matches the most recent token provided to the service. + StopOnDuplicateToken bool +} + +// GetVpnConnectionDeviceTypesPaginator is a paginator for +// GetVpnConnectionDeviceTypes +type GetVpnConnectionDeviceTypesPaginator struct { + options GetVpnConnectionDeviceTypesPaginatorOptions + client GetVpnConnectionDeviceTypesAPIClient + params *GetVpnConnectionDeviceTypesInput + nextToken *string + firstPage bool +} + +// NewGetVpnConnectionDeviceTypesPaginator returns a new +// GetVpnConnectionDeviceTypesPaginator +func NewGetVpnConnectionDeviceTypesPaginator(client GetVpnConnectionDeviceTypesAPIClient, params *GetVpnConnectionDeviceTypesInput, optFns ...func(*GetVpnConnectionDeviceTypesPaginatorOptions)) *GetVpnConnectionDeviceTypesPaginator { + if params == nil { + params = &GetVpnConnectionDeviceTypesInput{} + } + + options := GetVpnConnectionDeviceTypesPaginatorOptions{} + if params.MaxResults != nil { + options.Limit = *params.MaxResults + } + + for _, fn := range optFns { + fn(&options) + } + + return &GetVpnConnectionDeviceTypesPaginator{ + options: options, + client: client, + params: params, + firstPage: true, + } +} + +// HasMorePages returns a boolean indicating whether more pages are available +func (p *GetVpnConnectionDeviceTypesPaginator) HasMorePages() bool { + return p.firstPage || p.nextToken != nil +} + +// NextPage retrieves the next GetVpnConnectionDeviceTypes page. +func (p *GetVpnConnectionDeviceTypesPaginator) NextPage(ctx context.Context, optFns ...func(*Options)) (*GetVpnConnectionDeviceTypesOutput, error) { + if !p.HasMorePages() { + return nil, fmt.Errorf("no more pages available") + } + + params := *p.params + params.NextToken = p.nextToken + + var limit *int32 + if p.options.Limit > 0 { + limit = &p.options.Limit + } + params.MaxResults = limit + + result, err := p.client.GetVpnConnectionDeviceTypes(ctx, ¶ms, optFns...) + if err != nil { + return nil, err + } + p.firstPage = false + + prevToken := p.nextToken + p.nextToken = result.NextToken + + if p.options.StopOnDuplicateToken && prevToken != nil && p.nextToken != nil && *prevToken == *p.nextToken { + p.nextToken = nil + } + + return result, nil +} + +func newServiceMetadataMiddleware_opGetVpnConnectionDeviceTypes(region string) *awsmiddleware.RegisterServiceMetadata { + return &awsmiddleware.RegisterServiceMetadata{ + Region: region, + ServiceID: ServiceID, + SigningName: "ec2", + OperationName: "GetVpnConnectionDeviceTypes", + } +} diff --git a/service/ec2/api_op_ImportClientVpnClientCertificateRevocationList.go b/service/ec2/api_op_ImportClientVpnClientCertificateRevocationList.go index d394add9771..547f5b456ef 100644 --- a/service/ec2/api_op_ImportClientVpnClientCertificateRevocationList.go +++ b/service/ec2/api_op_ImportClientVpnClientCertificateRevocationList.go @@ -34,7 +34,7 @@ type ImportClientVpnClientCertificateRevocationListInput struct { // The client certificate revocation list file. For more information, see Generate // a Client Certificate Revocation List // (https://docs.aws.amazon.com/vpn/latest/clientvpn-admin/cvpn-working-certificates.html#cvpn-working-certificates-generate) - // in the AWS Client VPN Administrator Guide. + // in the Client VPN Administrator Guide. // // This member is required. CertificateRevocationList *string diff --git a/service/ec2/api_op_ModifyClientVpnEndpoint.go b/service/ec2/api_op_ModifyClientVpnEndpoint.go index d0e2de81def..ab71ef2e772 100644 --- a/service/ec2/api_op_ModifyClientVpnEndpoint.go +++ b/service/ec2/api_op_ModifyClientVpnEndpoint.go @@ -74,13 +74,13 @@ type ModifyClientVpnEndpointInput struct { SelfServicePortal types.SelfServicePortal // The ARN of the server certificate to be used. The server certificate must be - // provisioned in AWS Certificate Manager (ACM). + // provisioned in Certificate Manager (ACM). ServerCertificateArn *string // Indicates whether the VPN is split-tunnel. For information about split-tunnel - // VPN endpoints, see Split-Tunnel AWS Client VPN Endpoint + // VPN endpoints, see Split-tunnel Client VPN endpoint // (https://docs.aws.amazon.com/vpn/latest/clientvpn-admin/split-tunnel-vpn.html) - // in the AWS Client VPN Administrator Guide. + // in the Client VPN Administrator Guide. SplitTunnel *bool // The ID of the VPC to associate with the Client VPN endpoint. diff --git a/service/ec2/api_op_ModifyInstancePlacement.go b/service/ec2/api_op_ModifyInstancePlacement.go index b6d96cdc7c1..00dcc200a35 100644 --- a/service/ec2/api_op_ModifyInstancePlacement.go +++ b/service/ec2/api_op_ModifyInstancePlacement.go @@ -24,11 +24,10 @@ import ( // * Change the Dedicated Host with which an // instance is associated. // -// * Change the instance tenancy of an instance from host -// to dedicated, or from dedicated to host. +// * Change the instance tenancy of an instance. // -// * Move an instance to or from a -// placement group +// * Move +// an instance to or from a placement group // (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/placement-groups.html). // // At diff --git a/service/ec2/api_op_ModifyVpnConnection.go b/service/ec2/api_op_ModifyVpnConnection.go index 4141136a4f5..490b0b98363 100644 --- a/service/ec2/api_op_ModifyVpnConnection.go +++ b/service/ec2/api_op_ModifyVpnConnection.go @@ -11,41 +11,41 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Modifies the customer gateway or the target gateway of an AWS Site-to-Site VPN -// connection. To modify the target gateway, the following migration options are -// available: +// Modifies the customer gateway or the target gateway of an Amazon Web Services +// Site-to-Site VPN connection. To modify the target gateway, the following +// migration options are available: // -// * An existing virtual private gateway to a new virtual private -// gateway +// * An existing virtual private gateway to a new +// virtual private gateway // -// * An existing virtual private gateway to a transit gateway +// * An existing virtual private gateway to a transit +// gateway // -// * An -// existing transit gateway to a new transit gateway +// * An existing transit gateway to a new transit gateway // -// * An existing transit gateway -// to a virtual private gateway +// * An existing +// transit gateway to a virtual private gateway // -// Before you perform the migration to the new -// gateway, you must configure the new gateway. Use CreateVpnGateway to create a -// virtual private gateway, or CreateTransitGateway to create a transit gateway. -// This step is required when you migrate from a virtual private gateway with -// static routes to a transit gateway. You must delete the static routes before you -// migrate to the new gateway. Keep a copy of the static route before you delete -// it. You will need to add back these routes to the transit gateway after the VPN -// connection migration is complete. After you migrate to the new gateway, you -// might need to modify your VPC route table. Use CreateRoute and DeleteRoute to -// make the changes described in VPN Gateway Target Modification Required VPC Route -// Table Updates +// Before you perform the migration +// to the new gateway, you must configure the new gateway. Use CreateVpnGateway to +// create a virtual private gateway, or CreateTransitGateway to create a transit +// gateway. This step is required when you migrate from a virtual private gateway +// with static routes to a transit gateway. You must delete the static routes +// before you migrate to the new gateway. Keep a copy of the static route before +// you delete it. You will need to add back these routes to the transit gateway +// after the VPN connection migration is complete. After you migrate to the new +// gateway, you might need to modify your VPC route table. Use CreateRoute and +// DeleteRoute to make the changes described in Update VPC route tables // (https://docs.aws.amazon.com/vpn/latest/s2svpn/modify-vpn-target.html#step-update-routing) -// in the AWS Site-to-Site VPN User Guide. When the new gateway is a transit -// gateway, modify the transit gateway route table to allow traffic between the VPC -// and the AWS Site-to-Site VPN connection. Use CreateTransitGatewayRoute to add -// the routes. If you deleted VPN static routes, you must add the static routes to -// the transit gateway route table. After you perform this operation, the AWS VPN -// endpoint's IP addresses on the AWS side and the tunnel options remain intact. -// Your AWS Site-to-Site VPN connection will be temporarily unavailable for a brief -// period while we provision the new endpoints. +// in the Amazon Web Services Site-to-Site VPN User Guide. When the new gateway is +// a transit gateway, modify the transit gateway route table to allow traffic +// between the VPC and the Amazon Web Services Site-to-Site VPN connection. Use +// CreateTransitGatewayRoute to add the routes. If you deleted VPN static routes, +// you must add the static routes to the transit gateway route table. After you +// perform this operation, the VPN endpoint's IP addresses on the Amazon Web +// Services side and the tunnel options remain intact. Your Amazon Web Services +// Site-to-Site VPN connection will be temporarily unavailable for a brief period +// while we provision the new endpoints. func (c *Client) ModifyVpnConnection(ctx context.Context, params *ModifyVpnConnectionInput, optFns ...func(*Options)) (*ModifyVpnConnectionOutput, error) { if params == nil { params = &ModifyVpnConnectionInput{} @@ -80,7 +80,8 @@ type ModifyVpnConnectionInput struct { // The ID of the transit gateway. TransitGatewayId *string - // The ID of the virtual private gateway at the AWS side of the VPN connection. + // The ID of the virtual private gateway at the Amazon Web Services side of the VPN + // connection. VpnGatewayId *string noSmithyDocumentSerde diff --git a/service/ec2/api_op_ModifyVpnConnectionOptions.go b/service/ec2/api_op_ModifyVpnConnectionOptions.go index 0e131b9c63e..d1476d48201 100644 --- a/service/ec2/api_op_ModifyVpnConnectionOptions.go +++ b/service/ec2/api_op_ModifyVpnConnectionOptions.go @@ -12,9 +12,10 @@ import ( ) // Modifies the connection options for your Site-to-Site VPN connection. When you -// modify the VPN connection options, the VPN endpoint IP addresses on the AWS side -// do not change, and the tunnel options do not change. Your VPN connection will be -// temporarily unavailable for a brief period while the VPN connection is updated. +// modify the VPN connection options, the VPN endpoint IP addresses on the Amazon +// Web Services side do not change, and the tunnel options do not change. Your VPN +// connection will be temporarily unavailable for a brief period while the VPN +// connection is updated. func (c *Client) ModifyVpnConnectionOptions(ctx context.Context, params *ModifyVpnConnectionOptionsInput, optFns ...func(*Options)) (*ModifyVpnConnectionOptionsOutput, error) { if params == nil { params = &ModifyVpnConnectionOptionsInput{} @@ -51,10 +52,12 @@ type ModifyVpnConnectionOptionsInput struct { // Default: ::/0 LocalIpv6NetworkCidr *string - // The IPv4 CIDR on the AWS side of the VPN connection. Default: 0.0.0.0/0 + // The IPv4 CIDR on the Amazon Web Services side of the VPN connection. Default: + // 0.0.0.0/0 RemoteIpv4NetworkCidr *string - // The IPv6 CIDR on the AWS side of the VPN connection. Default: ::/0 + // The IPv6 CIDR on the Amazon Web Services side of the VPN connection. Default: + // ::/0 RemoteIpv6NetworkCidr *string noSmithyDocumentSerde diff --git a/service/ec2/api_op_ModifyVpnTunnelCertificate.go b/service/ec2/api_op_ModifyVpnTunnelCertificate.go index 375aa172182..fd96d2d45e9 100644 --- a/service/ec2/api_op_ModifyVpnTunnelCertificate.go +++ b/service/ec2/api_op_ModifyVpnTunnelCertificate.go @@ -29,7 +29,7 @@ func (c *Client) ModifyVpnTunnelCertificate(ctx context.Context, params *ModifyV type ModifyVpnTunnelCertificateInput struct { - // The ID of the AWS Site-to-Site VPN connection. + // The ID of the Amazon Web Services Site-to-Site VPN connection. // // This member is required. VpnConnectionId *string diff --git a/service/ec2/api_op_ModifyVpnTunnelOptions.go b/service/ec2/api_op_ModifyVpnTunnelOptions.go index 086fa06ac64..d5f9d1e43ae 100644 --- a/service/ec2/api_op_ModifyVpnTunnelOptions.go +++ b/service/ec2/api_op_ModifyVpnTunnelOptions.go @@ -11,12 +11,12 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Modifies the options for a VPN tunnel in an AWS Site-to-Site VPN connection. You -// can modify multiple options for a tunnel in a single request, but you can only -// modify one tunnel at a time. For more information, see Site-to-Site VPN Tunnel -// Options for Your Site-to-Site VPN Connection -// (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPNTunnels.html) in the AWS -// Site-to-Site VPN User Guide. +// Modifies the options for a VPN tunnel in an Amazon Web Services Site-to-Site VPN +// connection. You can modify multiple options for a tunnel in a single request, +// but you can only modify one tunnel at a time. For more information, see +// Site-to-Site VPN tunnel options for your Site-to-Site VPN connection +// (https://docs.aws.amazon.com/vpn/latest/s2svpn/VPNTunnels.html) in the Amazon +// Web Services Site-to-Site VPN User Guide. func (c *Client) ModifyVpnTunnelOptions(ctx context.Context, params *ModifyVpnTunnelOptionsInput, optFns ...func(*Options)) (*ModifyVpnTunnelOptionsOutput, error) { if params == nil { params = &ModifyVpnTunnelOptionsInput{} @@ -39,7 +39,7 @@ type ModifyVpnTunnelOptionsInput struct { // This member is required. TunnelOptions *types.ModifyVpnTunnelOptionsSpecification - // The ID of the AWS Site-to-Site VPN connection. + // The ID of the Amazon Web Services Site-to-Site VPN connection. // // This member is required. VpnConnectionId *string diff --git a/service/ec2/deserializers.go b/service/ec2/deserializers.go index f6412e9073a..1cc37cbe0aa 100644 --- a/service/ec2/deserializers.go +++ b/service/ec2/deserializers.go @@ -31592,6 +31592,188 @@ func awsEc2query_deserializeOpErrorGetTransitGatewayRouteTablePropagations(respo } } +type awsEc2query_deserializeOpGetVpnConnectionDeviceSampleConfiguration struct { +} + +func (*awsEc2query_deserializeOpGetVpnConnectionDeviceSampleConfiguration) ID() string { + return "OperationDeserializer" +} + +func (m *awsEc2query_deserializeOpGetVpnConnectionDeviceSampleConfiguration) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) ( + out middleware.DeserializeOutput, metadata middleware.Metadata, err error, +) { + out, metadata, err = next.HandleDeserialize(ctx, in) + if err != nil { + return out, metadata, err + } + + response, ok := out.RawResponse.(*smithyhttp.Response) + if !ok { + return out, metadata, &smithy.DeserializationError{Err: fmt.Errorf("unknown transport type %T", out.RawResponse)} + } + + if response.StatusCode < 200 || response.StatusCode >= 300 { + return out, metadata, awsEc2query_deserializeOpErrorGetVpnConnectionDeviceSampleConfiguration(response, &metadata) + } + output := &GetVpnConnectionDeviceSampleConfigurationOutput{} + out.Result = output + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + body := io.TeeReader(response.Body, ringBuffer) + rootDecoder := xml.NewDecoder(body) + t, err := smithyxml.FetchRootElement(rootDecoder) + if err == io.EOF { + return out, metadata, nil + } + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + return out, metadata, &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + } + + decoder := smithyxml.WrapNodeDecoder(rootDecoder, t) + err = awsEc2query_deserializeOpDocumentGetVpnConnectionDeviceSampleConfigurationOutput(&output, decoder) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + return out, metadata, err +} + +func awsEc2query_deserializeOpErrorGetVpnConnectionDeviceSampleConfiguration(response *smithyhttp.Response, metadata *middleware.Metadata) error { + var errorBuffer bytes.Buffer + if _, err := io.Copy(&errorBuffer, response.Body); err != nil { + return &smithy.DeserializationError{Err: fmt.Errorf("failed to copy error response body, %w", err)} + } + errorBody := bytes.NewReader(errorBuffer.Bytes()) + + errorCode := "UnknownError" + errorMessage := errorCode + + errorComponents, err := ec2query.GetErrorResponseComponents(errorBody) + if err != nil { + return err + } + awsmiddleware.SetRequestIDMetadata(metadata, errorComponents.RequestID) + if len(errorComponents.Code) != 0 { + errorCode = errorComponents.Code + } + if len(errorComponents.Message) != 0 { + errorMessage = errorComponents.Message + } + errorBody.Seek(0, io.SeekStart) + switch { + default: + genericError := &smithy.GenericAPIError{ + Code: errorCode, + Message: errorMessage, + } + return genericError + + } +} + +type awsEc2query_deserializeOpGetVpnConnectionDeviceTypes struct { +} + +func (*awsEc2query_deserializeOpGetVpnConnectionDeviceTypes) ID() string { + return "OperationDeserializer" +} + +func (m *awsEc2query_deserializeOpGetVpnConnectionDeviceTypes) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) ( + out middleware.DeserializeOutput, metadata middleware.Metadata, err error, +) { + out, metadata, err = next.HandleDeserialize(ctx, in) + if err != nil { + return out, metadata, err + } + + response, ok := out.RawResponse.(*smithyhttp.Response) + if !ok { + return out, metadata, &smithy.DeserializationError{Err: fmt.Errorf("unknown transport type %T", out.RawResponse)} + } + + if response.StatusCode < 200 || response.StatusCode >= 300 { + return out, metadata, awsEc2query_deserializeOpErrorGetVpnConnectionDeviceTypes(response, &metadata) + } + output := &GetVpnConnectionDeviceTypesOutput{} + out.Result = output + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + body := io.TeeReader(response.Body, ringBuffer) + rootDecoder := xml.NewDecoder(body) + t, err := smithyxml.FetchRootElement(rootDecoder) + if err == io.EOF { + return out, metadata, nil + } + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + return out, metadata, &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + } + + decoder := smithyxml.WrapNodeDecoder(rootDecoder, t) + err = awsEc2query_deserializeOpDocumentGetVpnConnectionDeviceTypesOutput(&output, decoder) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + return out, metadata, err +} + +func awsEc2query_deserializeOpErrorGetVpnConnectionDeviceTypes(response *smithyhttp.Response, metadata *middleware.Metadata) error { + var errorBuffer bytes.Buffer + if _, err := io.Copy(&errorBuffer, response.Body); err != nil { + return &smithy.DeserializationError{Err: fmt.Errorf("failed to copy error response body, %w", err)} + } + errorBody := bytes.NewReader(errorBuffer.Bytes()) + + errorCode := "UnknownError" + errorMessage := errorCode + + errorComponents, err := ec2query.GetErrorResponseComponents(errorBody) + if err != nil { + return err + } + awsmiddleware.SetRequestIDMetadata(metadata, errorComponents.RequestID) + if len(errorComponents.Code) != 0 { + errorCode = errorComponents.Code + } + if len(errorComponents.Message) != 0 { + errorMessage = errorComponents.Message + } + errorBody.Seek(0, io.SeekStart) + switch { + default: + genericError := &smithy.GenericAPIError{ + Code: errorCode, + Message: errorMessage, + } + return genericError + + } +} + type awsEc2query_deserializeOpImportClientVpnClientCertificateRevocationList struct { } @@ -62195,6 +62377,19 @@ func awsEc2query_deserializeDocumentInstance(v **types.Instance, decoder smithyx sv.Platform = types.PlatformValues(xtv) } + case strings.EqualFold("platformDetails", t.Name.Local): + val, err := decoder.Value() + if err != nil { + return err + } + if val == nil { + break + } + { + xtv := string(val) + sv.PlatformDetails = ptr.String(xtv) + } + case strings.EqualFold("privateDnsName", t.Name.Local): val, err := decoder.Value() if err != nil { @@ -62384,6 +62579,36 @@ func awsEc2query_deserializeDocumentInstance(v **types.Instance, decoder smithyx return err } + case strings.EqualFold("usageOperation", t.Name.Local): + val, err := decoder.Value() + if err != nil { + return err + } + if val == nil { + break + } + { + xtv := string(val) + sv.UsageOperation = ptr.String(xtv) + } + + case strings.EqualFold("usageOperationUpdateTime", t.Name.Local): + val, err := decoder.Value() + if err != nil { + return err + } + if val == nil { + break + } + { + xtv := string(val) + t, err := smithytime.ParseDateTime(xtv) + if err != nil { + return err + } + sv.UsageOperationUpdateTime = ptr.Time(t) + } + case strings.EqualFold("virtualizationType", t.Name.Local): val, err := decoder.Value() if err != nil { @@ -104480,6 +104705,162 @@ func awsEc2query_deserializeDocumentVpnConnection(v **types.VpnConnection, decod return nil } +func awsEc2query_deserializeDocumentVpnConnectionDeviceType(v **types.VpnConnectionDeviceType, decoder smithyxml.NodeDecoder) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + var sv *types.VpnConnectionDeviceType + if *v == nil { + sv = &types.VpnConnectionDeviceType{} + } else { + sv = *v + } + + for { + t, done, err := decoder.Token() + if err != nil { + return err + } + if done { + break + } + originalDecoder := decoder + decoder = smithyxml.WrapNodeDecoder(originalDecoder.Decoder, t) + switch { + case strings.EqualFold("platform", t.Name.Local): + val, err := decoder.Value() + if err != nil { + return err + } + if val == nil { + break + } + { + xtv := string(val) + sv.Platform = ptr.String(xtv) + } + + case strings.EqualFold("software", t.Name.Local): + val, err := decoder.Value() + if err != nil { + return err + } + if val == nil { + break + } + { + xtv := string(val) + sv.Software = ptr.String(xtv) + } + + case strings.EqualFold("vendor", t.Name.Local): + val, err := decoder.Value() + if err != nil { + return err + } + if val == nil { + break + } + { + xtv := string(val) + sv.Vendor = ptr.String(xtv) + } + + case strings.EqualFold("vpnConnectionDeviceTypeId", t.Name.Local): + val, err := decoder.Value() + if err != nil { + return err + } + if val == nil { + break + } + { + xtv := string(val) + sv.VpnConnectionDeviceTypeId = ptr.String(xtv) + } + + default: + // Do nothing and ignore the unexpected tag element + err = decoder.Decoder.Skip() + if err != nil { + return err + } + + } + decoder = originalDecoder + } + *v = sv + return nil +} + +func awsEc2query_deserializeDocumentVpnConnectionDeviceTypeList(v *[]types.VpnConnectionDeviceType, decoder smithyxml.NodeDecoder) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + var sv []types.VpnConnectionDeviceType + if *v == nil { + sv = make([]types.VpnConnectionDeviceType, 0) + } else { + sv = *v + } + + originalDecoder := decoder + for { + t, done, err := decoder.Token() + if err != nil { + return err + } + if done { + break + } + switch { + case strings.EqualFold("item", t.Name.Local): + var col types.VpnConnectionDeviceType + nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t) + destAddr := &col + if err := awsEc2query_deserializeDocumentVpnConnectionDeviceType(&destAddr, nodeDecoder); err != nil { + return err + } + col = *destAddr + sv = append(sv, col) + + default: + err = decoder.Decoder.Skip() + if err != nil { + return err + } + + } + decoder = originalDecoder + } + *v = sv + return nil +} + +func awsEc2query_deserializeDocumentVpnConnectionDeviceTypeListUnwrapped(v *[]types.VpnConnectionDeviceType, decoder smithyxml.NodeDecoder) error { + var sv []types.VpnConnectionDeviceType + if *v == nil { + sv = make([]types.VpnConnectionDeviceType, 0) + } else { + sv = *v + } + + switch { + default: + var mv types.VpnConnectionDeviceType + t := decoder.StartEl + _ = t + nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t) + destAddr := &mv + if err := awsEc2query_deserializeDocumentVpnConnectionDeviceType(&destAddr, nodeDecoder); err != nil { + return err + } + mv = *destAddr + sv = append(sv, mv) + } + *v = sv + return nil +} func awsEc2query_deserializeDocumentVpnConnectionList(v *[]types.VpnConnection, decoder smithyxml.NodeDecoder) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -122356,6 +122737,110 @@ func awsEc2query_deserializeOpDocumentGetTransitGatewayRouteTablePropagationsOut return nil } +func awsEc2query_deserializeOpDocumentGetVpnConnectionDeviceSampleConfigurationOutput(v **GetVpnConnectionDeviceSampleConfigurationOutput, decoder smithyxml.NodeDecoder) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + var sv *GetVpnConnectionDeviceSampleConfigurationOutput + if *v == nil { + sv = &GetVpnConnectionDeviceSampleConfigurationOutput{} + } else { + sv = *v + } + + for { + t, done, err := decoder.Token() + if err != nil { + return err + } + if done { + break + } + originalDecoder := decoder + decoder = smithyxml.WrapNodeDecoder(originalDecoder.Decoder, t) + switch { + case strings.EqualFold("vpnConnectionDeviceSampleConfiguration", t.Name.Local): + val, err := decoder.Value() + if err != nil { + return err + } + if val == nil { + break + } + { + xtv := string(val) + sv.VpnConnectionDeviceSampleConfiguration = ptr.String(xtv) + } + + default: + // Do nothing and ignore the unexpected tag element + err = decoder.Decoder.Skip() + if err != nil { + return err + } + + } + decoder = originalDecoder + } + *v = sv + return nil +} + +func awsEc2query_deserializeOpDocumentGetVpnConnectionDeviceTypesOutput(v **GetVpnConnectionDeviceTypesOutput, decoder smithyxml.NodeDecoder) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + var sv *GetVpnConnectionDeviceTypesOutput + if *v == nil { + sv = &GetVpnConnectionDeviceTypesOutput{} + } else { + sv = *v + } + + for { + t, done, err := decoder.Token() + if err != nil { + return err + } + if done { + break + } + originalDecoder := decoder + decoder = smithyxml.WrapNodeDecoder(originalDecoder.Decoder, t) + switch { + case strings.EqualFold("nextToken", t.Name.Local): + val, err := decoder.Value() + if err != nil { + return err + } + if val == nil { + break + } + { + xtv := string(val) + sv.NextToken = ptr.String(xtv) + } + + case strings.EqualFold("vpnConnectionDeviceTypeSet", t.Name.Local): + nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t) + if err := awsEc2query_deserializeDocumentVpnConnectionDeviceTypeList(&sv.VpnConnectionDeviceTypes, nodeDecoder); err != nil { + return err + } + + default: + // Do nothing and ignore the unexpected tag element + err = decoder.Decoder.Skip() + if err != nil { + return err + } + + } + decoder = originalDecoder + } + *v = sv + return nil +} + func awsEc2query_deserializeOpDocumentImportClientVpnClientCertificateRevocationListOutput(v **ImportClientVpnClientCertificateRevocationListOutput, decoder smithyxml.NodeDecoder) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) diff --git a/service/ec2/generated.json b/service/ec2/generated.json index c767112a2f8..fcf1693df90 100644 --- a/service/ec2/generated.json +++ b/service/ec2/generated.json @@ -364,6 +364,8 @@ "api_op_GetTransitGatewayPrefixListReferences.go", "api_op_GetTransitGatewayRouteTableAssociations.go", "api_op_GetTransitGatewayRouteTablePropagations.go", + "api_op_GetVpnConnectionDeviceSampleConfiguration.go", + "api_op_GetVpnConnectionDeviceTypes.go", "api_op_ImportClientVpnClientCertificateRevocationList.go", "api_op_ImportImage.go", "api_op_ImportInstance.go", diff --git a/service/ec2/serializers.go b/service/ec2/serializers.go index 386fa4b8725..d9db4a6e5b4 100644 --- a/service/ec2/serializers.go +++ b/service/ec2/serializers.go @@ -19952,6 +19952,118 @@ func (m *awsEc2query_serializeOpGetTransitGatewayRouteTablePropagations) HandleS return next.HandleSerialize(ctx, in) } +type awsEc2query_serializeOpGetVpnConnectionDeviceSampleConfiguration struct { +} + +func (*awsEc2query_serializeOpGetVpnConnectionDeviceSampleConfiguration) ID() string { + return "OperationSerializer" +} + +func (m *awsEc2query_serializeOpGetVpnConnectionDeviceSampleConfiguration) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) ( + out middleware.SerializeOutput, metadata middleware.Metadata, err error, +) { + request, ok := in.Request.(*smithyhttp.Request) + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown transport type %T", in.Request)} + } + + input, ok := in.Parameters.(*GetVpnConnectionDeviceSampleConfigurationInput) + _ = input + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown input parameters type %T", in.Parameters)} + } + + request.Request.URL.Path = "/" + request.Request.Method = "POST" + httpBindingEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + httpBindingEncoder.SetHeader("Content-Type").String("application/x-www-form-urlencoded") + + bodyWriter := bytes.NewBuffer(nil) + bodyEncoder := query.NewEncoder(bodyWriter) + body := bodyEncoder.Object() + body.Key("Action").String("GetVpnConnectionDeviceSampleConfiguration") + body.Key("Version").String("2016-11-15") + + if err := awsEc2query_serializeOpDocumentGetVpnConnectionDeviceSampleConfigurationInput(input, bodyEncoder.Value); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + err = bodyEncoder.Encode() + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request, err = request.SetStream(bytes.NewReader(bodyWriter.Bytes())); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request.Request, err = httpBindingEncoder.Encode(request.Request); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + in.Request = request + + return next.HandleSerialize(ctx, in) +} + +type awsEc2query_serializeOpGetVpnConnectionDeviceTypes struct { +} + +func (*awsEc2query_serializeOpGetVpnConnectionDeviceTypes) ID() string { + return "OperationSerializer" +} + +func (m *awsEc2query_serializeOpGetVpnConnectionDeviceTypes) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) ( + out middleware.SerializeOutput, metadata middleware.Metadata, err error, +) { + request, ok := in.Request.(*smithyhttp.Request) + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown transport type %T", in.Request)} + } + + input, ok := in.Parameters.(*GetVpnConnectionDeviceTypesInput) + _ = input + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown input parameters type %T", in.Parameters)} + } + + request.Request.URL.Path = "/" + request.Request.Method = "POST" + httpBindingEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + httpBindingEncoder.SetHeader("Content-Type").String("application/x-www-form-urlencoded") + + bodyWriter := bytes.NewBuffer(nil) + bodyEncoder := query.NewEncoder(bodyWriter) + body := bodyEncoder.Object() + body.Key("Action").String("GetVpnConnectionDeviceTypes") + body.Key("Version").String("2016-11-15") + + if err := awsEc2query_serializeOpDocumentGetVpnConnectionDeviceTypesInput(input, bodyEncoder.Value); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + err = bodyEncoder.Encode() + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request, err = request.SetStream(bytes.NewReader(bodyWriter.Bytes())); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request.Request, err = httpBindingEncoder.Encode(request.Request); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + in.Request = request + + return next.HandleSerialize(ctx, in) +} + type awsEc2query_serializeOpImportClientVpnClientCertificateRevocationList struct { } @@ -44000,6 +44112,55 @@ func awsEc2query_serializeOpDocumentGetTransitGatewayRouteTablePropagationsInput return nil } +func awsEc2query_serializeOpDocumentGetVpnConnectionDeviceSampleConfigurationInput(v *GetVpnConnectionDeviceSampleConfigurationInput, value query.Value) error { + object := value.Object() + _ = object + + if v.DryRun != nil { + objectKey := object.Key("DryRun") + objectKey.Boolean(*v.DryRun) + } + + if v.InternetKeyExchangeVersion != nil { + objectKey := object.Key("InternetKeyExchangeVersion") + objectKey.String(*v.InternetKeyExchangeVersion) + } + + if v.VpnConnectionDeviceTypeId != nil { + objectKey := object.Key("VpnConnectionDeviceTypeId") + objectKey.String(*v.VpnConnectionDeviceTypeId) + } + + if v.VpnConnectionId != nil { + objectKey := object.Key("VpnConnectionId") + objectKey.String(*v.VpnConnectionId) + } + + return nil +} + +func awsEc2query_serializeOpDocumentGetVpnConnectionDeviceTypesInput(v *GetVpnConnectionDeviceTypesInput, value query.Value) error { + object := value.Object() + _ = object + + if v.DryRun != nil { + objectKey := object.Key("DryRun") + objectKey.Boolean(*v.DryRun) + } + + if v.MaxResults != nil { + objectKey := object.Key("MaxResults") + objectKey.Integer(*v.MaxResults) + } + + if v.NextToken != nil { + objectKey := object.Key("NextToken") + objectKey.String(*v.NextToken) + } + + return nil +} + func awsEc2query_serializeOpDocumentImportClientVpnClientCertificateRevocationListInput(v *ImportClientVpnClientCertificateRevocationListInput, value query.Value) error { object := value.Object() _ = object diff --git a/service/ec2/types/types.go b/service/ec2/types/types.go index 597bc77ad7b..ea6f9471fde 100644 --- a/service/ec2/types/types.go +++ b/service/ec2/types/types.go @@ -962,7 +962,7 @@ type CertificateAuthentication struct { type CertificateAuthenticationRequest struct { // The ARN of the client certificate. The certificate must be signed by a - // certificate authority (CA) and it must be provisioned in AWS Certificate Manager + // certificate authority (CA) and it must be provisioned in Certificate Manager // (ACM). ClientRootCertificateChainArn *string @@ -1067,7 +1067,7 @@ type ClientConnectOptions struct { // enabled). Enabled *bool - // The Amazon Resource Name (ARN) of the AWS Lambda function used for connection + // The Amazon Resource Name (ARN) of the Lambda function used for connection // authorization. LambdaFunctionArn *string @@ -1080,7 +1080,7 @@ type ClientConnectResponseOptions struct { // Indicates whether client connect options are enabled. Enabled *bool - // The Amazon Resource Name (ARN) of the AWS Lambda function used for connection + // The Amazon Resource Name (ARN) of the Lambda function used for connection // authorization. LambdaFunctionArn *string @@ -1111,7 +1111,7 @@ type ClientData struct { // Describes the authentication methods used by a Client VPN endpoint. For more // information, see Authentication // (https://docs.aws.amazon.com/vpn/latest/clientvpn-admin/client-authentication.html) -// in the AWS Client VPN Administrator Guide. +// in the Client VPN Administrator Guide. type ClientVpnAuthentication struct { // Information about the Active Directory, if applicable. @@ -1132,7 +1132,7 @@ type ClientVpnAuthentication struct { // Describes the authentication method to be used by a Client VPN endpoint. For // more information, see Authentication // (https://docs.aws.amazon.com/vpn/latest/clientvpn-admin/authentication-authrization.html#client-authentication) -// in the AWS Client VPN Administrator Guide. +// in the Client VPN Administrator Guide. type ClientVpnAuthenticationRequest struct { // Information about the Active Directory to be used, if applicable. You must @@ -1280,11 +1280,11 @@ type ClientVpnEndpoint struct { // The ARN of the server certificate. ServerCertificateArn *string - // Indicates whether split-tunnel is enabled in the AWS Client VPN endpoint. For - // information about split-tunnel VPN endpoints, see Split-Tunnel AWS Client VPN - // Endpoint + // Indicates whether split-tunnel is enabled in the Client VPN endpoint. For + // information about split-tunnel VPN endpoints, see Split-Tunnel Client VPN + // endpoint // (https://docs.aws.amazon.com/vpn/latest/clientvpn-admin/split-tunnel-vpn.html) - // in the AWS Client VPN Administrator Guide. + // in the Client VPN Administrator Guide. SplitTunnel *bool // The current state of the Client VPN endpoint. @@ -4364,7 +4364,7 @@ type Instance struct { // The time the instance was launched. LaunchTime *time.Time - // The license configurations. + // The license configurations for the instance. Licenses []LicenseConfiguration // The metadata options for the instance. @@ -4385,6 +4385,12 @@ type Instance struct { // The value is Windows for Windows instances; otherwise blank. Platform PlatformValues + // The platform details value for the instance. For more information, see AMI + // billing information fields + // (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/billing-info-fields.html) + // in the Amazon EC2 User Guide. + PlatformDetails *string + // (IPv4 only) The private DNS hostname name assigned to the instance. This DNS // hostname can only be used inside the Amazon EC2 network. This name is not // available until the instance enters the running state. [EC2-VPC] The @@ -4448,6 +4454,15 @@ type Instance struct { // Any tags assigned to the instance. Tags []Tag + // The usage operation value for the instance. For more information, see AMI + // billing information fields + // (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/billing-info-fields.html) + // in the Amazon EC2 User Guide. + UsageOperation *string + + // The time that the usage operation was last updated. + UsageOperationUpdateTime *time.Time + // The virtualization type of the instance. VirtualizationType VirtualizationType @@ -6933,7 +6948,7 @@ type ModifyTransitGatewayVpcAttachmentRequestOptions struct { noSmithyDocumentSerde } -// The AWS Site-to-Site VPN tunnel options to modify. +// The Amazon Web Services Site-to-Site VPN tunnel options to modify. type ModifyVpnTunnelOptionsSpecification struct { // The action to take after DPD timeout occurs. Specify restart to restart the IKE @@ -6998,9 +7013,10 @@ type ModifyVpnTunnelOptionsSpecification struct { RekeyFuzzPercentage *int32 // The margin time, in seconds, before the phase 2 lifetime expires, during which - // the AWS side of the VPN connection performs an IKE rekey. The exact time of the - // rekey is randomly selected based on the value for RekeyFuzzPercentage. - // Constraints: A value between 60 and half of Phase2LifetimeSeconds. Default: 540 + // the Amazon Web Services side of the VPN connection performs an IKE rekey. The + // exact time of the rekey is randomly selected based on the value for + // RekeyFuzzPercentage. Constraints: A value between 60 and half of + // Phase2LifetimeSeconds. Default: 540 RekeyMarginTimeSeconds *int32 // The number of packets in an IKE replay window. Constraints: A value between 64 @@ -7009,8 +7025,8 @@ type ModifyVpnTunnelOptionsSpecification struct { // The action to take when the establishing the tunnel for the VPN connection. By // default, your customer gateway device must initiate the IKE negotiation and - // bring up the tunnel. Specify start for AWS to initiate the IKE negotiation. - // Valid Values: add | start Default: add + // bring up the tunnel. Specify start for Amazon Web Services to initiate the IKE + // negotiation. Valid Values: add | start Default: add StartupAction *string // The range of inside IPv4 addresses for the tunnel. Any specified CIDR blocks @@ -12415,7 +12431,7 @@ type TunnelOption struct { RekeyFuzzPercentage *int32 // The margin time, in seconds, before the phase 2 lifetime expires, during which - // the AWS side of the VPN connection performs an IKE rekey. + // the Amazon Web Services side of the VPN connection performs an IKE rekey. RekeyMarginTimeSeconds *int32 // The number of packets in an IKE replay window. @@ -13176,8 +13192,9 @@ type VpcPeeringConnectionVpcInfo struct { // Describes a VPN connection. type VpnConnection struct { - // The category of the VPN connection. A value of VPN indicates an AWS VPN - // connection. A value of VPN-Classic indicates an AWS Classic VPN connection. + // The category of the VPN connection. A value of VPN indicates an Amazon Web + // Services VPN connection. A value of VPN-Classic indicates an Amazon Web Services + // Classic VPN connection. Category *string // The configuration information for the VPN connection's customer gateway (in the @@ -13213,12 +13230,35 @@ type VpnConnection struct { // The ID of the VPN connection. VpnConnectionId *string - // The ID of the virtual private gateway at the AWS side of the VPN connection. + // The ID of the virtual private gateway at the Amazon Web Services side of the VPN + // connection. VpnGatewayId *string noSmithyDocumentSerde } +// List of customer gateway devices that have a sample configuration file available +// for use. You can also see the list of device types with sample configuration +// files available under Your customer gateway device +// (https://docs.aws.amazon.com/vpn/latest/s2svpn/your-cgw.html) in the Amazon Web +// Services Site-to-Site VPN User Guide. +type VpnConnectionDeviceType struct { + + // Customer gateway device platform. + Platform *string + + // Customer gateway device software version. + Software *string + + // Customer gateway device vendor. + Vendor *string + + // Customer gateway device identifier. + VpnConnectionDeviceTypeId *string + + noSmithyDocumentSerde +} + // Describes VPN connection options. type VpnConnectionOptions struct { @@ -13231,10 +13271,10 @@ type VpnConnectionOptions struct { // The IPv6 CIDR on the customer gateway (on-premises) side of the VPN connection. LocalIpv6NetworkCidr *string - // The IPv4 CIDR on the AWS side of the VPN connection. + // The IPv4 CIDR on the Amazon Web Services side of the VPN connection. RemoteIpv4NetworkCidr *string - // The IPv6 CIDR on the AWS side of the VPN connection. + // The IPv6 CIDR on the Amazon Web Services side of the VPN connection. RemoteIpv6NetworkCidr *string // Indicates whether the VPN connection uses static routes only. Static routes must @@ -13264,10 +13304,12 @@ type VpnConnectionOptionsSpecification struct { // Default: ::/0 LocalIpv6NetworkCidr *string - // The IPv4 CIDR on the AWS side of the VPN connection. Default: 0.0.0.0/0 + // The IPv4 CIDR on the Amazon Web Services side of the VPN connection. Default: + // 0.0.0.0/0 RemoteIpv4NetworkCidr *string - // The IPv6 CIDR on the AWS side of the VPN connection. Default: ::/0 + // The IPv6 CIDR on the Amazon Web Services side of the VPN connection. Default: + // ::/0 RemoteIpv6NetworkCidr *string // Indicate whether the VPN connection uses static routes only. If you are creating @@ -13392,9 +13434,10 @@ type VpnTunnelOptionsSpecification struct { RekeyFuzzPercentage *int32 // The margin time, in seconds, before the phase 2 lifetime expires, during which - // the AWS side of the VPN connection performs an IKE rekey. The exact time of the - // rekey is randomly selected based on the value for RekeyFuzzPercentage. - // Constraints: A value between 60 and half of Phase2LifetimeSeconds. Default: 540 + // the Amazon Web Services side of the VPN connection performs an IKE rekey. The + // exact time of the rekey is randomly selected based on the value for + // RekeyFuzzPercentage. Constraints: A value between 60 and half of + // Phase2LifetimeSeconds. Default: 540 RekeyMarginTimeSeconds *int32 // The number of packets in an IKE replay window. Constraints: A value between 64 @@ -13403,8 +13446,8 @@ type VpnTunnelOptionsSpecification struct { // The action to take when the establishing the tunnel for the VPN connection. By // default, your customer gateway device must initiate the IKE negotiation and - // bring up the tunnel. Specify start for AWS to initiate the IKE negotiation. - // Valid Values: add | start Default: add + // bring up the tunnel. Specify start for Amazon Web Services to initiate the IKE + // negotiation. Valid Values: add | start Default: add StartupAction *string // The range of inside IPv4 addresses for the tunnel. Any specified CIDR blocks diff --git a/service/ec2/validators.go b/service/ec2/validators.go index 59c0ef78178..d8ae75098ae 100644 --- a/service/ec2/validators.go +++ b/service/ec2/validators.go @@ -4290,6 +4290,26 @@ func (m *validateOpGetTransitGatewayRouteTablePropagations) HandleInitialize(ctx return next.HandleInitialize(ctx, in) } +type validateOpGetVpnConnectionDeviceSampleConfiguration struct { +} + +func (*validateOpGetVpnConnectionDeviceSampleConfiguration) ID() string { + return "OperationInputValidation" +} + +func (m *validateOpGetVpnConnectionDeviceSampleConfiguration) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) ( + out middleware.InitializeOutput, metadata middleware.Metadata, err error, +) { + input, ok := in.Parameters.(*GetVpnConnectionDeviceSampleConfigurationInput) + if !ok { + return out, metadata, fmt.Errorf("unknown input parameters type %T", in.Parameters) + } + if err := validateOpGetVpnConnectionDeviceSampleConfigurationInput(input); err != nil { + return out, metadata, err + } + return next.HandleInitialize(ctx, in) +} + type validateOpImportClientVpnClientCertificateRevocationList struct { } @@ -7066,6 +7086,10 @@ func addOpGetTransitGatewayRouteTablePropagationsValidationMiddleware(stack *mid return stack.Initialize.Add(&validateOpGetTransitGatewayRouteTablePropagations{}, middleware.After) } +func addOpGetVpnConnectionDeviceSampleConfigurationValidationMiddleware(stack *middleware.Stack) error { + return stack.Initialize.Add(&validateOpGetVpnConnectionDeviceSampleConfiguration{}, middleware.After) +} + func addOpImportClientVpnClientCertificateRevocationListValidationMiddleware(stack *middleware.Stack) error { return stack.Initialize.Add(&validateOpImportClientVpnClientCertificateRevocationList{}, middleware.After) } @@ -11631,6 +11655,24 @@ func validateOpGetTransitGatewayRouteTablePropagationsInput(v *GetTransitGateway } } +func validateOpGetVpnConnectionDeviceSampleConfigurationInput(v *GetVpnConnectionDeviceSampleConfigurationInput) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "GetVpnConnectionDeviceSampleConfigurationInput"} + if v.VpnConnectionId == nil { + invalidParams.Add(smithy.NewErrParamRequired("VpnConnectionId")) + } + if v.VpnConnectionDeviceTypeId == nil { + invalidParams.Add(smithy.NewErrParamRequired("VpnConnectionDeviceTypeId")) + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + func validateOpImportClientVpnClientCertificateRevocationListInput(v *ImportClientVpnClientCertificateRevocationListInput) error { if v == nil { return nil diff --git a/service/ecr/api_op_CreateRepository.go b/service/ecr/api_op_CreateRepository.go index a00f130ada5..e3bfa67908c 100644 --- a/service/ecr/api_op_CreateRepository.go +++ b/service/ecr/api_op_CreateRepository.go @@ -53,6 +53,10 @@ type CreateRepositoryInput struct { // will be immutable which will prevent them from being overwritten. ImageTagMutability types.ImageTagMutability + // The AWS account ID associated with the registry to create the repository. If you + // do not specify a registry, the default registry is assumed. + RegistryId *string + // The metadata that you apply to the repository to help you categorize and // organize them. Each tag consists of a key and an optional value, both of which // you define. Tag keys can have a maximum character length of 128 characters, and diff --git a/service/ecr/api_op_DescribeImageReplicationStatus.go b/service/ecr/api_op_DescribeImageReplicationStatus.go new file mode 100644 index 00000000000..0edd166a70f --- /dev/null +++ b/service/ecr/api_op_DescribeImageReplicationStatus.go @@ -0,0 +1,136 @@ +// Code generated by smithy-go-codegen DO NOT EDIT. + +package ecr + +import ( + "context" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/aws/signer/v4" + "github.com/aws/aws-sdk-go-v2/service/ecr/types" + "github.com/aws/smithy-go/middleware" + smithyhttp "github.com/aws/smithy-go/transport/http" +) + +// Returns the replication status for a specified image. +func (c *Client) DescribeImageReplicationStatus(ctx context.Context, params *DescribeImageReplicationStatusInput, optFns ...func(*Options)) (*DescribeImageReplicationStatusOutput, error) { + if params == nil { + params = &DescribeImageReplicationStatusInput{} + } + + result, metadata, err := c.invokeOperation(ctx, "DescribeImageReplicationStatus", params, optFns, c.addOperationDescribeImageReplicationStatusMiddlewares) + if err != nil { + return nil, err + } + + out := result.(*DescribeImageReplicationStatusOutput) + out.ResultMetadata = metadata + return out, nil +} + +type DescribeImageReplicationStatusInput struct { + + // An object with identifying information for an image in an Amazon ECR repository. + // + // This member is required. + ImageId *types.ImageIdentifier + + // The name of the repository that the image is in. + // + // This member is required. + RepositoryName *string + + // The Amazon Web Services account ID associated with the registry. If you do not + // specify a registry, the default registry is assumed. + RegistryId *string + + noSmithyDocumentSerde +} + +type DescribeImageReplicationStatusOutput struct { + + // An object with identifying information for an image in an Amazon ECR repository. + ImageId *types.ImageIdentifier + + // The replication status details for the images in the specified repository. + ReplicationStatuses []types.ImageReplicationStatus + + // The repository name associated with the request. + RepositoryName *string + + // Metadata pertaining to the operation's result. + ResultMetadata middleware.Metadata + + noSmithyDocumentSerde +} + +func (c *Client) addOperationDescribeImageReplicationStatusMiddlewares(stack *middleware.Stack, options Options) (err error) { + err = stack.Serialize.Add(&awsAwsjson11_serializeOpDescribeImageReplicationStatus{}, middleware.After) + if err != nil { + return err + } + err = stack.Deserialize.Add(&awsAwsjson11_deserializeOpDescribeImageReplicationStatus{}, middleware.After) + if err != nil { + return err + } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddComputeContentLengthMiddleware(stack); err != nil { + return err + } + if err = addResolveEndpointMiddleware(stack, options); err != nil { + return err + } + if err = v4.AddComputePayloadSHA256Middleware(stack); err != nil { + return err + } + if err = addRetryMiddlewares(stack, options); err != nil { + return err + } + if err = addHTTPSignerV4Middleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddRawResponseToMetadata(stack); err != nil { + return err + } + if err = awsmiddleware.AddRecordResponseTiming(stack); err != nil { + return err + } + if err = addClientUserAgent(stack); err != nil { + return err + } + if err = smithyhttp.AddErrorCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = addOpDescribeImageReplicationStatusValidationMiddleware(stack); err != nil { + return err + } + if err = stack.Initialize.Add(newServiceMetadataMiddleware_opDescribeImageReplicationStatus(options.Region), middleware.Before); err != nil { + return err + } + if err = addRequestIDRetrieverMiddleware(stack); err != nil { + return err + } + if err = addResponseErrorMiddleware(stack); err != nil { + return err + } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } + return nil +} + +func newServiceMetadataMiddleware_opDescribeImageReplicationStatus(region string) *awsmiddleware.RegisterServiceMetadata { + return &awsmiddleware.RegisterServiceMetadata{ + Region: region, + ServiceID: ServiceID, + SigningName: "ecr", + OperationName: "DescribeImageReplicationStatus", + } +} diff --git a/service/ecr/api_op_DescribeImageScanFindings.go b/service/ecr/api_op_DescribeImageScanFindings.go index 298eaf7eb59..ea73d82f639 100644 --- a/service/ecr/api_op_DescribeImageScanFindings.go +++ b/service/ecr/api_op_DescribeImageScanFindings.go @@ -34,7 +34,7 @@ func (c *Client) DescribeImageScanFindings(ctx context.Context, params *Describe type DescribeImageScanFindingsInput struct { - // An object with identifying information for an Amazon ECR image. + // An object with identifying information for an image in an Amazon ECR repository. // // This member is required. ImageId *types.ImageIdentifier @@ -71,7 +71,7 @@ type DescribeImageScanFindingsInput struct { type DescribeImageScanFindingsOutput struct { - // An object with identifying information for an Amazon ECR image. + // An object with identifying information for an image in an Amazon ECR repository. ImageId *types.ImageIdentifier // The information contained in the image scan findings. diff --git a/service/ecr/api_op_StartImageScan.go b/service/ecr/api_op_StartImageScan.go index ce76af76d3b..8a9785f49b4 100644 --- a/service/ecr/api_op_StartImageScan.go +++ b/service/ecr/api_op_StartImageScan.go @@ -33,7 +33,7 @@ func (c *Client) StartImageScan(ctx context.Context, params *StartImageScanInput type StartImageScanInput struct { - // An object with identifying information for an Amazon ECR image. + // An object with identifying information for an image in an Amazon ECR repository. // // This member is required. ImageId *types.ImageIdentifier @@ -53,7 +53,7 @@ type StartImageScanInput struct { type StartImageScanOutput struct { - // An object with identifying information for an Amazon ECR image. + // An object with identifying information for an image in an Amazon ECR repository. ImageId *types.ImageIdentifier // The current state of the scan. diff --git a/service/ecr/deserializers.go b/service/ecr/deserializers.go index 47773208e5d..ec522be9087 100644 --- a/service/ecr/deserializers.go +++ b/service/ecr/deserializers.go @@ -861,6 +861,9 @@ func awsAwsjson11_deserializeOpErrorDeleteRegistryPolicy(response *smithyhttp.Re case strings.EqualFold("ServerException", errorCode): return awsAwsjson11_deserializeErrorServerException(response, errorBody) + case strings.EqualFold("ValidationException", errorCode): + return awsAwsjson11_deserializeErrorValidationException(response, errorBody) + default: genericError := &smithy.GenericAPIError{ Code: errorCode, @@ -1114,6 +1117,129 @@ func awsAwsjson11_deserializeOpErrorDeleteRepositoryPolicy(response *smithyhttp. } } +type awsAwsjson11_deserializeOpDescribeImageReplicationStatus struct { +} + +func (*awsAwsjson11_deserializeOpDescribeImageReplicationStatus) ID() string { + return "OperationDeserializer" +} + +func (m *awsAwsjson11_deserializeOpDescribeImageReplicationStatus) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) ( + out middleware.DeserializeOutput, metadata middleware.Metadata, err error, +) { + out, metadata, err = next.HandleDeserialize(ctx, in) + if err != nil { + return out, metadata, err + } + + response, ok := out.RawResponse.(*smithyhttp.Response) + if !ok { + return out, metadata, &smithy.DeserializationError{Err: fmt.Errorf("unknown transport type %T", out.RawResponse)} + } + + if response.StatusCode < 200 || response.StatusCode >= 300 { + return out, metadata, awsAwsjson11_deserializeOpErrorDescribeImageReplicationStatus(response, &metadata) + } + output := &DescribeImageReplicationStatusOutput{} + out.Result = output + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(response.Body, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + var shape interface{} + if err := decoder.Decode(&shape); err != nil && err != io.EOF { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + err = awsAwsjson11_deserializeOpDocumentDescribeImageReplicationStatusOutput(&output, shape) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + return out, metadata, err +} + +func awsAwsjson11_deserializeOpErrorDescribeImageReplicationStatus(response *smithyhttp.Response, metadata *middleware.Metadata) error { + var errorBuffer bytes.Buffer + if _, err := io.Copy(&errorBuffer, response.Body); err != nil { + return &smithy.DeserializationError{Err: fmt.Errorf("failed to copy error response body, %w", err)} + } + errorBody := bytes.NewReader(errorBuffer.Bytes()) + + errorCode := "UnknownError" + errorMessage := errorCode + + code := response.Header.Get("X-Amzn-ErrorType") + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(errorBody, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + code, message, err := restjson.GetErrorInfo(decoder) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return err + } + + errorBody.Seek(0, io.SeekStart) + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + if len(message) != 0 { + errorMessage = message + } + + switch { + case strings.EqualFold("ImageNotFoundException", errorCode): + return awsAwsjson11_deserializeErrorImageNotFoundException(response, errorBody) + + case strings.EqualFold("InvalidParameterException", errorCode): + return awsAwsjson11_deserializeErrorInvalidParameterException(response, errorBody) + + case strings.EqualFold("RepositoryNotFoundException", errorCode): + return awsAwsjson11_deserializeErrorRepositoryNotFoundException(response, errorBody) + + case strings.EqualFold("ServerException", errorCode): + return awsAwsjson11_deserializeErrorServerException(response, errorBody) + + case strings.EqualFold("ValidationException", errorCode): + return awsAwsjson11_deserializeErrorValidationException(response, errorBody) + + default: + genericError := &smithy.GenericAPIError{ + Code: errorCode, + Message: errorMessage, + } + return genericError + + } +} + type awsAwsjson11_deserializeOpDescribeImages struct { } @@ -2175,6 +2301,9 @@ func awsAwsjson11_deserializeOpErrorGetRegistryPolicy(response *smithyhttp.Respo case strings.EqualFold("ServerException", errorCode): return awsAwsjson11_deserializeErrorServerException(response, errorBody) + case strings.EqualFold("ValidationException", errorCode): + return awsAwsjson11_deserializeErrorValidationException(response, errorBody) + default: genericError := &smithy.GenericAPIError{ Code: errorCode, @@ -3252,6 +3381,9 @@ func awsAwsjson11_deserializeOpErrorPutRegistryPolicy(response *smithyhttp.Respo case strings.EqualFold("ServerException", errorCode): return awsAwsjson11_deserializeErrorServerException(response, errorBody) + case strings.EqualFold("ValidationException", errorCode): + return awsAwsjson11_deserializeErrorValidationException(response, errorBody) + default: genericError := &smithy.GenericAPIError{ Code: errorCode, @@ -6032,6 +6164,107 @@ func awsAwsjson11_deserializeDocumentImageNotFoundException(v **types.ImageNotFo return nil } +func awsAwsjson11_deserializeDocumentImageReplicationStatus(v **types.ImageReplicationStatus, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.ImageReplicationStatus + if *v == nil { + sv = &types.ImageReplicationStatus{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "failureCode": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected ReplicationError to be of type string, got %T instead", value) + } + sv.FailureCode = ptr.String(jtv) + } + + case "region": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected Region to be of type string, got %T instead", value) + } + sv.Region = ptr.String(jtv) + } + + case "registryId": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected RegistryId to be of type string, got %T instead", value) + } + sv.RegistryId = ptr.String(jtv) + } + + case "status": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected ReplicationStatus to be of type string, got %T instead", value) + } + sv.Status = types.ReplicationStatus(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + +func awsAwsjson11_deserializeDocumentImageReplicationStatusList(v *[]types.ImageReplicationStatus, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.([]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var cv []types.ImageReplicationStatus + if *v == nil { + cv = []types.ImageReplicationStatus{} + } else { + cv = *v + } + + for _, value := range shape { + var col types.ImageReplicationStatus + destAddr := &col + if err := awsAwsjson11_deserializeDocumentImageReplicationStatus(&destAddr, value); err != nil { + return err + } + col = *destAddr + cv = append(cv, col) + + } + *v = cv + return nil +} + func awsAwsjson11_deserializeDocumentImageScanFinding(v **types.ImageScanFinding, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -7633,6 +7866,11 @@ func awsAwsjson11_deserializeDocumentReplicationRule(v **types.ReplicationRule, return err } + case "repositoryFilters": + if err := awsAwsjson11_deserializeDocumentRepositoryFilterList(&sv.RepositoryFilters, value); err != nil { + return err + } + default: _, _ = key, value @@ -7818,6 +8056,89 @@ func awsAwsjson11_deserializeDocumentRepositoryAlreadyExistsException(v **types. return nil } +func awsAwsjson11_deserializeDocumentRepositoryFilter(v **types.RepositoryFilter, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.RepositoryFilter + if *v == nil { + sv = &types.RepositoryFilter{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "filter": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected RepositoryFilterValue to be of type string, got %T instead", value) + } + sv.Filter = ptr.String(jtv) + } + + case "filterType": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected RepositoryFilterType to be of type string, got %T instead", value) + } + sv.FilterType = types.RepositoryFilterType(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + +func awsAwsjson11_deserializeDocumentRepositoryFilterList(v *[]types.RepositoryFilter, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.([]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var cv []types.RepositoryFilter + if *v == nil { + cv = []types.RepositoryFilter{} + } else { + cv = *v + } + + for _, value := range shape { + var col types.RepositoryFilter + destAddr := &col + if err := awsAwsjson11_deserializeDocumentRepositoryFilter(&destAddr, value); err != nil { + return err + } + col = *destAddr + cv = append(cv, col) + + } + *v = cv + return nil +} + func awsAwsjson11_deserializeDocumentRepositoryList(v *[]types.Repository, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -8738,6 +9059,56 @@ func awsAwsjson11_deserializeOpDocumentDeleteRepositoryPolicyOutput(v **DeleteRe return nil } +func awsAwsjson11_deserializeOpDocumentDescribeImageReplicationStatusOutput(v **DescribeImageReplicationStatusOutput, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *DescribeImageReplicationStatusOutput + if *v == nil { + sv = &DescribeImageReplicationStatusOutput{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "imageId": + if err := awsAwsjson11_deserializeDocumentImageIdentifier(&sv.ImageId, value); err != nil { + return err + } + + case "replicationStatuses": + if err := awsAwsjson11_deserializeDocumentImageReplicationStatusList(&sv.ReplicationStatuses, value); err != nil { + return err + } + + case "repositoryName": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected RepositoryName to be of type string, got %T instead", value) + } + sv.RepositoryName = ptr.String(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsAwsjson11_deserializeOpDocumentDescribeImageScanFindingsOutput(v **DescribeImageScanFindingsOutput, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) diff --git a/service/ecr/generated.json b/service/ecr/generated.json index 5c4d5aa642d..7bd5a8ef189 100644 --- a/service/ecr/generated.json +++ b/service/ecr/generated.json @@ -15,6 +15,7 @@ "api_op_DeleteRegistryPolicy.go", "api_op_DeleteRepository.go", "api_op_DeleteRepositoryPolicy.go", + "api_op_DescribeImageReplicationStatus.go", "api_op_DescribeImageScanFindings.go", "api_op_DescribeImages.go", "api_op_DescribeRegistry.go", diff --git a/service/ecr/serializers.go b/service/ecr/serializers.go index a61d1afb43c..2811ba4a01d 100644 --- a/service/ecr/serializers.go +++ b/service/ecr/serializers.go @@ -437,6 +437,53 @@ func (m *awsAwsjson11_serializeOpDeleteRepositoryPolicy) HandleSerialize(ctx con return next.HandleSerialize(ctx, in) } +type awsAwsjson11_serializeOpDescribeImageReplicationStatus struct { +} + +func (*awsAwsjson11_serializeOpDescribeImageReplicationStatus) ID() string { + return "OperationSerializer" +} + +func (m *awsAwsjson11_serializeOpDescribeImageReplicationStatus) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) ( + out middleware.SerializeOutput, metadata middleware.Metadata, err error, +) { + request, ok := in.Request.(*smithyhttp.Request) + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown transport type %T", in.Request)} + } + + input, ok := in.Parameters.(*DescribeImageReplicationStatusInput) + _ = input + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown input parameters type %T", in.Parameters)} + } + + request.Request.URL.Path = "/" + request.Request.Method = "POST" + httpBindingEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + httpBindingEncoder.SetHeader("Content-Type").String("application/x-amz-json-1.1") + httpBindingEncoder.SetHeader("X-Amz-Target").String("AmazonEC2ContainerRegistry_V20150921.DescribeImageReplicationStatus") + + jsonEncoder := smithyjson.NewEncoder() + if err := awsAwsjson11_serializeOpDocumentDescribeImageReplicationStatusInput(input, jsonEncoder.Value); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request, err = request.SetStream(bytes.NewReader(jsonEncoder.Bytes())); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request.Request, err = httpBindingEncoder.Encode(request.Request); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + in.Request = request + + return next.HandleSerialize(ctx, in) +} + type awsAwsjson11_serializeOpDescribeImages struct { } @@ -1805,6 +1852,13 @@ func awsAwsjson11_serializeDocumentReplicationRule(v *types.ReplicationRule, val } } + if v.RepositoryFilters != nil { + ok := object.Key("repositoryFilters") + if err := awsAwsjson11_serializeDocumentRepositoryFilterList(v.RepositoryFilters, ok); err != nil { + return err + } + } + return nil } @@ -1821,6 +1875,36 @@ func awsAwsjson11_serializeDocumentReplicationRuleList(v []types.ReplicationRule return nil } +func awsAwsjson11_serializeDocumentRepositoryFilter(v *types.RepositoryFilter, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if v.Filter != nil { + ok := object.Key("filter") + ok.String(*v.Filter) + } + + if len(v.FilterType) > 0 { + ok := object.Key("filterType") + ok.String(string(v.FilterType)) + } + + return nil +} + +func awsAwsjson11_serializeDocumentRepositoryFilterList(v []types.RepositoryFilter, value smithyjson.Value) error { + array := value.Array() + defer array.Close() + + for i := range v { + av := array.Value() + if err := awsAwsjson11_serializeDocumentRepositoryFilter(&v[i], av); err != nil { + return err + } + } + return nil +} + func awsAwsjson11_serializeDocumentRepositoryNameList(v []string, value smithyjson.Value) error { array := value.Array() defer array.Close() @@ -2004,6 +2088,11 @@ func awsAwsjson11_serializeOpDocumentCreateRepositoryInput(v *CreateRepositoryIn ok.String(string(v.ImageTagMutability)) } + if v.RegistryId != nil { + ok := object.Key("registryId") + ok.String(*v.RegistryId) + } + if v.RepositoryName != nil { ok := object.Key("repositoryName") ok.String(*v.RepositoryName) @@ -2082,6 +2171,30 @@ func awsAwsjson11_serializeOpDocumentDeleteRepositoryPolicyInput(v *DeleteReposi return nil } +func awsAwsjson11_serializeOpDocumentDescribeImageReplicationStatusInput(v *DescribeImageReplicationStatusInput, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if v.ImageId != nil { + ok := object.Key("imageId") + if err := awsAwsjson11_serializeDocumentImageIdentifier(v.ImageId, ok); err != nil { + return err + } + } + + if v.RegistryId != nil { + ok := object.Key("registryId") + ok.String(*v.RegistryId) + } + + if v.RepositoryName != nil { + ok := object.Key("repositoryName") + ok.String(*v.RepositoryName) + } + + return nil +} + func awsAwsjson11_serializeOpDocumentDescribeImageScanFindingsInput(v *DescribeImageScanFindingsInput, value smithyjson.Value) error { object := value.Object() defer object.Close() diff --git a/service/ecr/types/enums.go b/service/ecr/types/enums.go index f9a881823ed..90f05a2697f 100644 --- a/service/ecr/types/enums.go +++ b/service/ecr/types/enums.go @@ -166,6 +166,42 @@ func (LifecyclePolicyPreviewStatus) Values() []LifecyclePolicyPreviewStatus { } } +type ReplicationStatus string + +// Enum values for ReplicationStatus +const ( + ReplicationStatusInProgress ReplicationStatus = "IN_PROGRESS" + ReplicationStatusComplete ReplicationStatus = "COMPLETE" + ReplicationStatusFailed ReplicationStatus = "FAILED" +) + +// Values returns all known values for ReplicationStatus. 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 (ReplicationStatus) Values() []ReplicationStatus { + return []ReplicationStatus{ + "IN_PROGRESS", + "COMPLETE", + "FAILED", + } +} + +type RepositoryFilterType string + +// Enum values for RepositoryFilterType +const ( + RepositoryFilterTypePrefixMatch RepositoryFilterType = "PREFIX_MATCH" +) + +// Values returns all known values for RepositoryFilterType. 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 (RepositoryFilterType) Values() []RepositoryFilterType { + return []RepositoryFilterType{ + "PREFIX_MATCH", + } +} + type ScanStatus string // Enum values for ScanStatus diff --git a/service/ecr/types/types.go b/service/ecr/types/types.go index ec50b2a728b..408a73c337c 100644 --- a/service/ecr/types/types.go +++ b/service/ecr/types/types.go @@ -173,7 +173,7 @@ type ImageFailure struct { noSmithyDocumentSerde } -// An object with identifying information for an Amazon ECR image. +// An object with identifying information for an image in an Amazon ECR repository. type ImageIdentifier struct { // The sha256 digest of the image manifest. @@ -185,6 +185,24 @@ type ImageIdentifier struct { noSmithyDocumentSerde } +// The status of the replication process for an image. +type ImageReplicationStatus struct { + + // The failure code for a replication that has failed. + FailureCode *string + + // The destination Region for the image replication. + Region *string + + // The AWS account ID associated with the registry to which the image belongs. + RegistryId *string + + // The image replication status. + Status ReplicationStatus + + noSmithyDocumentSerde +} + // Contains information about an image scan finding. type ImageScanFinding struct { @@ -362,9 +380,8 @@ type ListImagesFilter struct { // The replication configuration for a registry. type ReplicationConfiguration struct { - // An array of objects representing the replication rules for a replication - // configuration. A replication configuration may contain only one replication rule - // but the rule may contain one or more replication destinations. + // An array of objects representing the replication destinations and repository + // filters for a replication configuration. // // This member is required. Rules []ReplicationRule @@ -372,15 +389,17 @@ type ReplicationConfiguration struct { noSmithyDocumentSerde } -// An array of objects representing the details of a replication destination. +// An array of objects representing the destination for a replication rule. type ReplicationDestination struct { - // A Region to replicate to. + // The Region to replicate to. // // This member is required. Region *string - // The account ID of the destination registry to replicate to. + // The Amazon Web Services account ID of the Amazon ECR private registry to + // replicate to. When configuring cross-Region replication within your own + // registry, specify your own account ID. // // This member is required. RegistryId *string @@ -388,16 +407,20 @@ type ReplicationDestination struct { noSmithyDocumentSerde } -// An array of objects representing the replication destinations for a replication -// configuration. A replication configuration may contain only one replication rule -// but the rule may contain one or more replication destinations. +// An array of objects representing the replication destinations and repository +// filters for a replication configuration. type ReplicationRule struct { - // An array of objects representing the details of a replication destination. + // An array of objects representing the destination for a replication rule. // // This member is required. Destinations []ReplicationDestination + // An array of objects representing the filters for a replication rule. Specifying + // a repository filter for a replication rule provides a method for controlling + // which repositories in a private registry are replicated. + RepositoryFilters []RepositoryFilter + noSmithyDocumentSerde } @@ -437,6 +460,28 @@ type Repository struct { noSmithyDocumentSerde } +// The filter settings used with image replication. Specifying a repository filter +// to a replication rule provides a method for controlling which repositories in a +// private registry are replicated. If no repository filter is specified, all +// images in the repository are replicated. +type RepositoryFilter struct { + + // The repository filter details. When the PREFIX_MATCH filter type is specified, + // this value is required and should be the repository name prefix to configure + // replication for. + // + // This member is required. + Filter *string + + // The repository filter type. The only supported value is PREFIX_MATCH, which is a + // repository name prefix specified with the filter parameter. + // + // This member is required. + FilterType RepositoryFilterType + + noSmithyDocumentSerde +} + // The metadata that you apply to a resource to help you categorize and organize // them. Each tag consists of a key and an optional value, both of which you // define. Tag keys can have a maximum character length of 128 characters, and tag diff --git a/service/ecr/validators.go b/service/ecr/validators.go index 251d67ff6ea..1baf1f52b77 100644 --- a/service/ecr/validators.go +++ b/service/ecr/validators.go @@ -170,6 +170,26 @@ func (m *validateOpDeleteRepositoryPolicy) HandleInitialize(ctx context.Context, return next.HandleInitialize(ctx, in) } +type validateOpDescribeImageReplicationStatus struct { +} + +func (*validateOpDescribeImageReplicationStatus) ID() string { + return "OperationInputValidation" +} + +func (m *validateOpDescribeImageReplicationStatus) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) ( + out middleware.InitializeOutput, metadata middleware.Metadata, err error, +) { + input, ok := in.Parameters.(*DescribeImageReplicationStatusInput) + if !ok { + return out, metadata, fmt.Errorf("unknown input parameters type %T", in.Parameters) + } + if err := validateOpDescribeImageReplicationStatusInput(input); err != nil { + return out, metadata, err + } + return next.HandleInitialize(ctx, in) +} + type validateOpDescribeImageScanFindings struct { } @@ -622,6 +642,10 @@ func addOpDeleteRepositoryPolicyValidationMiddleware(stack *middleware.Stack) er return stack.Initialize.Add(&validateOpDeleteRepositoryPolicy{}, middleware.After) } +func addOpDescribeImageReplicationStatusValidationMiddleware(stack *middleware.Stack) error { + return stack.Initialize.Add(&validateOpDescribeImageReplicationStatus{}, middleware.After) +} + func addOpDescribeImageScanFindingsValidationMiddleware(stack *middleware.Stack) error { return stack.Initialize.Add(&validateOpDescribeImageScanFindings{}, middleware.After) } @@ -787,6 +811,11 @@ func validateReplicationRule(v *types.ReplicationRule) error { invalidParams.AddNested("Destinations", err.(smithy.InvalidParamsError)) } } + if v.RepositoryFilters != nil { + if err := validateRepositoryFilterList(v.RepositoryFilters); err != nil { + invalidParams.AddNested("RepositoryFilters", err.(smithy.InvalidParamsError)) + } + } if invalidParams.Len() > 0 { return invalidParams } else { @@ -811,6 +840,41 @@ func validateReplicationRuleList(v []types.ReplicationRule) error { } } +func validateRepositoryFilter(v *types.RepositoryFilter) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "RepositoryFilter"} + if v.Filter == nil { + invalidParams.Add(smithy.NewErrParamRequired("Filter")) + } + if len(v.FilterType) == 0 { + invalidParams.Add(smithy.NewErrParamRequired("FilterType")) + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + +func validateRepositoryFilterList(v []types.RepositoryFilter) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "RepositoryFilterList"} + for i := range v { + if err := validateRepositoryFilter(&v[i]); err != nil { + invalidParams.AddNested(fmt.Sprintf("[%d]", i), err.(smithy.InvalidParamsError)) + } + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + func validateOpBatchCheckLayerAvailabilityInput(v *BatchCheckLayerAvailabilityInput) error { if v == nil { return nil @@ -951,6 +1015,24 @@ func validateOpDeleteRepositoryPolicyInput(v *DeleteRepositoryPolicyInput) error } } +func validateOpDescribeImageReplicationStatusInput(v *DescribeImageReplicationStatusInput) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "DescribeImageReplicationStatusInput"} + if v.RepositoryName == nil { + invalidParams.Add(smithy.NewErrParamRequired("RepositoryName")) + } + if v.ImageId == nil { + invalidParams.Add(smithy.NewErrParamRequired("ImageId")) + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + func validateOpDescribeImageScanFindingsInput(v *DescribeImageScanFindingsInput) error { if v == nil { return nil diff --git a/service/elasticsearchservice/api_op_ListDomainNames.go b/service/elasticsearchservice/api_op_ListDomainNames.go index c89e569e81d..bcc6a08c763 100644 --- a/service/elasticsearchservice/api_op_ListDomainNames.go +++ b/service/elasticsearchservice/api_op_ListDomainNames.go @@ -28,15 +28,21 @@ func (c *Client) ListDomainNames(ctx context.Context, params *ListDomainNamesInp return out, nil } +// Container for the parameters to the ListDomainNames operation. type ListDomainNamesInput struct { + + // Optional parameter to filter the output by domain engine type. Acceptable values + // are 'Elasticsearch' and 'OpenSearch'. + EngineType types.EngineType + noSmithyDocumentSerde } -// The result of a ListDomainNames operation. Contains the names of all -// Elasticsearch domains owned by this account. +// The result of a ListDomainNames operation. Contains the names of all domains +// owned by this account and their respective engine types. type ListDomainNamesOutput struct { - // List of Elasticsearch domain names. + // List of domain names and respective engine types. DomainNames []types.DomainInfo // Metadata pertaining to the operation's result. diff --git a/service/elasticsearchservice/deserializers.go b/service/elasticsearchservice/deserializers.go index d2c4a5ce779..5457c02f647 100644 --- a/service/elasticsearchservice/deserializers.go +++ b/service/elasticsearchservice/deserializers.go @@ -8012,6 +8012,15 @@ func awsRestjson1_deserializeDocumentDomainInfo(v **types.DomainInfo, value inte sv.DomainName = ptr.String(jtv) } + case "EngineType": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected EngineType to be of type string, got %T instead", value) + } + sv.EngineType = types.EngineType(jtv) + } + default: _, _ = key, value diff --git a/service/elasticsearchservice/serializers.go b/service/elasticsearchservice/serializers.go index 51b76f8ca04..dc1ba00a511 100644 --- a/service/elasticsearchservice/serializers.go +++ b/service/elasticsearchservice/serializers.go @@ -1941,6 +1941,10 @@ func (m *awsRestjson1_serializeOpListDomainNames) HandleSerialize(ctx context.Co return out, metadata, &smithy.SerializationError{Err: err} } + if err := awsRestjson1_serializeOpHttpBindingsListDomainNamesInput(input, restEncoder); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + if request.Request, err = restEncoder.Encode(request.Request); err != nil { return out, metadata, &smithy.SerializationError{Err: err} } @@ -1953,6 +1957,10 @@ func awsRestjson1_serializeOpHttpBindingsListDomainNamesInput(v *ListDomainNames return fmt.Errorf("unsupported serialization of nil %T", v) } + if len(v.EngineType) > 0 { + encoder.SetQuery("engineType").String(string(v.EngineType)) + } + return nil } diff --git a/service/elasticsearchservice/types/enums.go b/service/elasticsearchservice/types/enums.go index 5688bbf0f37..82784e80656 100644 --- a/service/elasticsearchservice/types/enums.go +++ b/service/elasticsearchservice/types/enums.go @@ -136,6 +136,24 @@ func (DomainPackageStatus) Values() []DomainPackageStatus { } } +type EngineType string + +// Enum values for EngineType +const ( + EngineTypeOpenSearch EngineType = "OpenSearch" + EngineTypeElasticsearch EngineType = "Elasticsearch" +) + +// Values returns all known values for EngineType. 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 (EngineType) Values() []EngineType { + return []EngineType{ + "OpenSearch", + "Elasticsearch", + } +} + type ESPartitionInstanceType string // Enum values for ESPartitionInstanceType diff --git a/service/elasticsearchservice/types/types.go b/service/elasticsearchservice/types/types.go index 1d7d4267e61..d8cd0812cdb 100644 --- a/service/elasticsearchservice/types/types.go +++ b/service/elasticsearchservice/types/types.go @@ -322,10 +322,10 @@ type CognitoOptionsStatus struct { noSmithyDocumentSerde } -// Specifies settings for cold storage. +// Specifies the configuration for cold storage options such as enabled type ColdStorageOptions struct { - // True to enable cold storage for an Elasticsearch domain. + // Enable cold storage option. Accepted values true or false // // This member is required. Enabled *bool @@ -411,6 +411,9 @@ type DomainInfo struct { // Specifies the DomainName. DomainName *string + // Specifies the EngineType of the domain. + EngineType EngineType + noSmithyDocumentSerde } @@ -526,7 +529,7 @@ type EBSOptionsStatus struct { // of instances. type ElasticsearchClusterConfig struct { - // Specifies the ColdStorageOptions configuration for an Elasticsearch domain. + // Specifies the ColdStorageOptions config for Elasticsearch Domain ColdStorageOptions *ColdStorageOptions // Total number of dedicated master nodes, active and on standby, for the cluster. diff --git a/service/iam/api_op_ChangePassword.go b/service/iam/api_op_ChangePassword.go index 132d8f267b8..b6df84cfa60 100644 --- a/service/iam/api_op_ChangePassword.go +++ b/service/iam/api_op_ChangePassword.go @@ -12,11 +12,11 @@ import ( // Changes the password of the IAM user who is calling this operation. This // operation can be performed using the CLI, the Amazon Web Services API, or the My -// Security Credentials page in the Management Console. The account root user -// password is not affected by this operation. Use UpdateLoginProfile to use the -// CLI, the Amazon Web Services API, or the Users page in the IAM console to change -// the password for any IAM user. For more information about modifying passwords, -// see Managing passwords +// Security Credentials page in the Amazon Web Services Management Console. The +// Amazon Web Services account root user password is not affected by this +// operation. Use UpdateLoginProfile to use the CLI, the Amazon Web Services API, +// or the Users page in the IAM console to change the password for any IAM user. +// For more information about modifying passwords, see Managing passwords // (https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingLogins.html) in // the IAM User Guide. func (c *Client) ChangePassword(ctx context.Context, params *ChangePasswordInput, optFns ...func(*Options)) (*ChangePasswordOutput, error) { @@ -36,15 +36,16 @@ func (c *Client) ChangePassword(ctx context.Context, params *ChangePasswordInput type ChangePasswordInput struct { - // The new password. The new password must conform to the account's password - // policy, if one exists. The regex pattern (http://wikipedia.org/wiki/regex) that - // is used to validate this parameter is a string of characters. That string can - // include almost any printable ASCII character from the space (\u0020) through the - // end of the ASCII character range (\u00FF). You can also include the tab - // (\u0009), line feed (\u000A), and carriage return (\u000D) characters. Any of - // these characters are valid in a password. However, many tools, such as the - // Management Console, might restrict the ability to type certain characters - // because they have special meaning within that tool. + // The new password. The new password must conform to the Amazon Web Services + // account's password policy, if one exists. The regex pattern + // (http://wikipedia.org/wiki/regex) that is used to validate this parameter is a + // string of characters. That string can include almost any printable ASCII + // character from the space (\u0020) through the end of the ASCII character range + // (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and + // carriage return (\u000D) characters. Any of these characters are valid in a + // password. However, many tools, such as the Amazon Web Services Management + // Console, might restrict the ability to type certain characters because they have + // special meaning within that tool. // // This member is required. NewPassword *string diff --git a/service/iam/api_op_CreateAccessKey.go b/service/iam/api_op_CreateAccessKey.go index bb43979c8d8..6e991c58ac7 100644 --- a/service/iam/api_op_CreateAccessKey.go +++ b/service/iam/api_op_CreateAccessKey.go @@ -15,16 +15,17 @@ import ( // Services access key ID for the specified user. The default status for new keys // is Active. If you do not specify a user name, IAM determines the user name // implicitly based on the Amazon Web Services access key ID signing the request. -// This operation works for access keys under the account. Consequently, you can -// use this operation to manage account root user credentials. This is true even if -// the account has no associated users. For information about quotas on the number -// of keys you can create, see IAM and STS quotas +// This operation works for access keys under the Amazon Web Services account. +// Consequently, you can use this operation to manage Amazon Web Services account +// root user credentials. This is true even if the Amazon Web Services account has +// no associated users. For information about quotas on the number of keys you can +// create, see IAM and STS quotas // (https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-quotas.html) in -// the IAM User Guide. To ensure the security of your account, the secret access -// key is accessible only during key and user creation. You must save the key (for -// example, in a text file) if you want to be able to access it again. If a secret -// key is lost, you can delete the access keys for the associated user and then -// create new keys. +// the IAM User Guide. To ensure the security of your Amazon Web Services account, +// the secret access key is accessible only during key and user creation. You must +// save the key (for example, in a text file) if you want to be able to access it +// again. If a secret key is lost, you can delete the access keys for the +// associated user and then create new keys. func (c *Client) CreateAccessKey(ctx context.Context, params *CreateAccessKeyInput, optFns ...func(*Options)) (*CreateAccessKeyOutput, error) { if params == nil { params = &CreateAccessKeyInput{} diff --git a/service/iam/api_op_CreateAccountAlias.go b/service/iam/api_op_CreateAccountAlias.go index bf3a58e714b..633e35e1a5c 100644 --- a/service/iam/api_op_CreateAccountAlias.go +++ b/service/iam/api_op_CreateAccountAlias.go @@ -10,8 +10,9 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Creates an alias for your account. For information about using an account alias, -// see Using an alias for your account ID +// Creates an alias for your Amazon Web Services account. For information about +// using an Amazon Web Services account alias, see Using an alias for your Amazon +// Web Services account ID // (https://docs.aws.amazon.com/IAM/latest/UserGuide/AccountAlias.html) in the IAM // User Guide. func (c *Client) CreateAccountAlias(ctx context.Context, params *CreateAccountAliasInput, optFns ...func(*Options)) (*CreateAccountAliasOutput, error) { diff --git a/service/iam/api_op_CreateLoginProfile.go b/service/iam/api_op_CreateLoginProfile.go index 04f3e2c7fb3..d4593087a78 100644 --- a/service/iam/api_op_CreateLoginProfile.go +++ b/service/iam/api_op_CreateLoginProfile.go @@ -12,11 +12,12 @@ import ( ) // Creates a password for the specified IAM user. A password allows an IAM user to -// access Amazon Web Services services through the Management Console. You can use -// the CLI, the Amazon Web Services API, or the Users page in the IAM console to -// create a password for any IAM user. Use ChangePassword to update your own -// existing password in the My Security Credentials page in the Management Console. -// For more information about managing passwords, see Managing passwords +// access Amazon Web Services services through the Amazon Web Services Management +// Console. You can use the CLI, the Amazon Web Services API, or the Users page in +// the IAM console to create a password for any IAM user. Use ChangePassword to +// update your own existing password in the My Security Credentials page in the +// Amazon Web Services Management Console. For more information about managing +// passwords, see Managing passwords // (https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingLogins.html) in // the IAM User Guide. func (c *Client) CreateLoginProfile(ctx context.Context, params *CreateLoginProfileInput, optFns ...func(*Options)) (*CreateLoginProfileOutput, error) { @@ -42,9 +43,9 @@ type CreateLoginProfileInput struct { // character from the space (\u0020) through the end of the ASCII character range // (\u00FF). You can also include the tab (\u0009), line feed (\u000A), and // carriage return (\u000D) characters. Any of these characters are valid in a - // password. However, many tools, such as the Management Console, might restrict - // the ability to type certain characters because they have special meaning within - // that tool. + // password. However, many tools, such as the Amazon Web Services Management + // Console, might restrict the ability to type certain characters because they have + // special meaning within that tool. // // This member is required. Password *string diff --git a/service/iam/api_op_CreateOpenIDConnectProvider.go b/service/iam/api_op_CreateOpenIDConnectProvider.go index f842f988c29..18008ad8aa2 100644 --- a/service/iam/api_op_CreateOpenIDConnectProvider.go +++ b/service/iam/api_op_CreateOpenIDConnectProvider.go @@ -35,7 +35,7 @@ import ( // thumbprints of one or more server certificates that the IdP uses // // You get all of -// this information from the OIDC IdP that you want to use to access Amazon Web +// this information from the OIDC IdP you want to use to access Amazon Web // Services. Amazon Web Services secures communication with some OIDC identity // providers (IdPs) through our library of trusted certificate authorities (CAs) // instead of using a certificate thumbprint to verify your IdP server certificate. @@ -74,8 +74,8 @@ type CreateOpenIDConnectProviderInput struct { // keys at https://keys.server.example.com/openid-connect. In that case, the // thumbprint string would be the hex-encoded SHA-1 hash value of the certificate // used by https://keys.server.example.com. For more information about obtaining - // the OIDC provider's thumbprint, see Obtaining the thumbprint for an OpenID - // Connect provider + // the OIDC provider thumbprint, see Obtaining the thumbprint for an OpenID Connect + // provider // (https://docs.aws.amazon.com/IAM/latest/UserGuide/identity-providers-oidc-obtain-thumbprint.html) // in the IAM User Guide. // @@ -86,17 +86,18 @@ type CreateOpenIDConnectProviderInput struct { // correspond to the iss claim in the provider's OpenID Connect ID tokens. Per the // OIDC standard, path components are allowed but query parameters are not. // Typically the URL consists of only a hostname, like https://server.example.org - // or https://example.com. You cannot register the same provider multiple times in - // a single account. If you try to submit a URL that has already been used for an - // OpenID Connect provider in the account, you will get an error. + // or https://example.com. The URL should not contain a port number. You cannot + // register the same provider multiple times in a single Amazon Web Services + // account. If you try to submit a URL that has already been used for an OpenID + // Connect provider in the Amazon Web Services account, you will get an error. // // This member is required. Url *string - // A list of client IDs (also known as audiences). When a mobile or web app + // Provides a list of client IDs, also known as audiences. When a mobile or web app // registers with an OpenID Connect provider, they establish a value that - // identifies the application. (This is the value that's sent as the client_id - // parameter on OAuth requests.) You can register multiple client IDs with the same + // identifies the application. This is the value that's sent as the client_id + // parameter on OAuth requests. You can register multiple client IDs with the same // provider. For example, you might have multiple applications that use the same // OIDC provider. You cannot register more than 100 client IDs with a single IAM // OIDC provider. There is no defined format for a client ID. The diff --git a/service/iam/api_op_CreatePolicy.go b/service/iam/api_op_CreatePolicy.go index bae4c0c48b4..7aa59de9872 100644 --- a/service/iam/api_op_CreatePolicy.go +++ b/service/iam/api_op_CreatePolicy.go @@ -11,10 +11,10 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Creates a new managed policy for your account. This operation creates a policy -// version with a version identifier of v1 and sets v1 as the policy's default -// version. For more information about policy versions, see Versioning for managed -// policies +// Creates a new managed policy for your Amazon Web Services account. This +// operation creates a policy version with a version identifier of v1 and sets v1 +// as the policy's default version. For more information about policy versions, see +// Versioning for managed policies // (https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-versions.html) // in the IAM User Guide. As a best practice, you can validate your IAM policies. // To learn more, see Validating IAM policies @@ -89,7 +89,8 @@ type CreatePolicyInput struct { // forward slash (/) by itself or a string that must begin and end with forward // slashes. In addition, it can contain any ASCII character from the ! (\u0021) // through the DEL character (\u007F), including most punctuation characters, - // digits, and upper and lowercased letters. + // digits, and upper and lowercased letters. You cannot use an asterisk (*) in the + // path name. Path *string // A list of tags that you want to attach to the new IAM customer managed policy. diff --git a/service/iam/api_op_CreateRole.go b/service/iam/api_op_CreateRole.go index e651d41bd1b..dc107211b50 100644 --- a/service/iam/api_op_CreateRole.go +++ b/service/iam/api_op_CreateRole.go @@ -11,10 +11,11 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Creates a new role for your account. For more information about roles, see IAM -// roles (https://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html). -// For information about quotas for role names and the number of roles you can -// create, see IAM and STS quotas +// Creates a new role for your Amazon Web Services account. For more information +// about roles, see IAM roles +// (https://docs.aws.amazon.com/IAM/latest/UserGuide/WorkingWithRoles.html). For +// information about quotas for role names and the number of roles you can create, +// see IAM and STS quotas // (https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-quotas.html) in // the IAM User Guide. func (c *Client) CreateRole(ctx context.Context, params *CreateRoleInput, optFns ...func(*Options)) (*CreateRoleOutput, error) { diff --git a/service/iam/api_op_CreateSAMLProvider.go b/service/iam/api_op_CreateSAMLProvider.go index a7c53e51792..823b64cc35e 100644 --- a/service/iam/api_op_CreateSAMLProvider.go +++ b/service/iam/api_op_CreateSAMLProvider.go @@ -15,17 +15,17 @@ import ( // SAML 2.0. The SAML provider resource that you create with this operation can be // used as a principal in an IAM role's trust policy. Such a policy can enable // federated users who sign in using the SAML IdP to assume the role. You can -// create an IAM role that supports Web-based single sign-on (SSO) to the -// Management Console or one that supports API access to Amazon Web Services. When -// you create the SAML provider resource, you upload a SAML metadata document that -// you get from your IdP. That document includes the issuer's name, expiration -// information, and keys that can be used to validate the SAML authentication -// response (assertions) that the IdP sends. You must generate the metadata -// document using the identity management software that is used as your +// create an IAM role that supports Web-based single sign-on (SSO) to the Amazon +// Web Services Management Console or one that supports API access to Amazon Web +// Services. When you create the SAML provider resource, you upload a SAML metadata +// document that you get from your IdP. That document includes the issuer's name, +// expiration information, and keys that can be used to validate the SAML +// authentication response (assertions) that the IdP sends. You must generate the +// metadata document using the identity management software that is used as your // organization's IdP. This operation requires Signature Version 4 // (https://docs.aws.amazon.com/general/latest/gr/signature-version-4.html). For -// more information, see Enabling SAML 2.0 federated users to access the Management -// Console +// more information, see Enabling SAML 2.0 federated users to access the Amazon Web +// Services Management Console // (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_enable-console-saml.html) // and About SAML 2.0-based federation // (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_providers_saml.html) diff --git a/service/iam/api_op_CreateUser.go b/service/iam/api_op_CreateUser.go index 598766b29a8..48bc3a60c43 100644 --- a/service/iam/api_op_CreateUser.go +++ b/service/iam/api_op_CreateUser.go @@ -11,8 +11,8 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Creates a new IAM user for your account. For information about quotas for the -// number of IAM users you can create, see IAM and STS quotas +// Creates a new IAM user for your Amazon Web Services account. For information +// about quotas for the number of IAM users you can create, see IAM and STS quotas // (https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_iam-quotas.html) in // the IAM User Guide. func (c *Client) CreateUser(ctx context.Context, params *CreateUserInput, optFns ...func(*Options)) (*CreateUserOutput, error) { diff --git a/service/iam/api_op_CreateVirtualMFADevice.go b/service/iam/api_op_CreateVirtualMFADevice.go index 2478ee454a8..8fc2e0dc3a3 100644 --- a/service/iam/api_op_CreateVirtualMFADevice.go +++ b/service/iam/api_op_CreateVirtualMFADevice.go @@ -11,10 +11,10 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Creates a new virtual MFA device for the account. After creating the virtual -// MFA, use EnableMFADevice to attach the MFA device to an IAM user. For more -// information about creating and working with virtual MFA devices, see Using a -// virtual MFA device +// Creates a new virtual MFA device for the Amazon Web Services account. After +// creating the virtual MFA, use EnableMFADevice to attach the MFA device to an IAM +// user. For more information about creating and working with virtual MFA devices, +// see Using a virtual MFA device // (https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_VirtualMFA.html) in the // IAM User Guide. For information about the maximum number of MFA devices you can // create, see IAM and STS quotas diff --git a/service/iam/api_op_DeleteAccessKey.go b/service/iam/api_op_DeleteAccessKey.go index ccff1bbfe9f..01ed1c03cef 100644 --- a/service/iam/api_op_DeleteAccessKey.go +++ b/service/iam/api_op_DeleteAccessKey.go @@ -13,9 +13,9 @@ import ( // Deletes the access key pair associated with the specified IAM user. If you do // not specify a user name, IAM determines the user name implicitly based on the // Amazon Web Services access key ID signing the request. This operation works for -// access keys under the account. Consequently, you can use this operation to -// manage account root user credentials even if the account has no associated -// users. +// access keys under the Amazon Web Services account. Consequently, you can use +// this operation to manage Amazon Web Services account root user credentials even +// if the Amazon Web Services account has no associated users. func (c *Client) DeleteAccessKey(ctx context.Context, params *DeleteAccessKeyInput, optFns ...func(*Options)) (*DeleteAccessKeyOutput, error) { if params == nil { params = &DeleteAccessKeyInput{} diff --git a/service/iam/api_op_DeleteAccountAlias.go b/service/iam/api_op_DeleteAccountAlias.go index fff2c9c61b0..6c86a2eaf92 100644 --- a/service/iam/api_op_DeleteAccountAlias.go +++ b/service/iam/api_op_DeleteAccountAlias.go @@ -10,8 +10,9 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Deletes the specified account alias. For information about using an Amazon Web -// Services account alias, see Using an alias for your account ID +// Deletes the specified Amazon Web Services account alias. For information about +// using an Amazon Web Services account alias, see Using an alias for your Amazon +// Web Services account ID // (https://docs.aws.amazon.com/IAM/latest/UserGuide/AccountAlias.html) in the IAM // User Guide. func (c *Client) DeleteAccountAlias(ctx context.Context, params *DeleteAccountAliasInput, optFns ...func(*Options)) (*DeleteAccountAliasOutput, error) { diff --git a/service/iam/api_op_DeleteAccountPasswordPolicy.go b/service/iam/api_op_DeleteAccountPasswordPolicy.go index b452c395289..85b2f5c1280 100644 --- a/service/iam/api_op_DeleteAccountPasswordPolicy.go +++ b/service/iam/api_op_DeleteAccountPasswordPolicy.go @@ -10,7 +10,8 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Deletes the password policy for the account. There are no parameters. +// Deletes the password policy for the Amazon Web Services account. There are no +// parameters. func (c *Client) DeleteAccountPasswordPolicy(ctx context.Context, params *DeleteAccountPasswordPolicyInput, optFns ...func(*Options)) (*DeleteAccountPasswordPolicyOutput, error) { if params == nil { params = &DeleteAccountPasswordPolicyInput{} diff --git a/service/iam/api_op_DeleteLoginProfile.go b/service/iam/api_op_DeleteLoginProfile.go index 2132d0b220f..80b63c7a38b 100644 --- a/service/iam/api_op_DeleteLoginProfile.go +++ b/service/iam/api_op_DeleteLoginProfile.go @@ -11,15 +11,16 @@ import ( ) // Deletes the password for the specified IAM user, which terminates the user's -// ability to access Amazon Web Services services through the Management Console. -// You can use the CLI, the Amazon Web Services API, or the Users page in the IAM -// console to delete a password for any IAM user. You can use ChangePassword to -// update, but not delete, your own password in the My Security Credentials page in -// the Management Console. Deleting a user's password does not prevent a user from -// accessing Amazon Web Services through the command line interface or the API. To -// prevent all user access, you must also either make any access keys inactive or -// delete them. For more information about making keys inactive or deleting them, -// see UpdateAccessKey and DeleteAccessKey. +// ability to access Amazon Web Services services through the Amazon Web Services +// Management Console. You can use the CLI, the Amazon Web Services API, or the +// Users page in the IAM console to delete a password for any IAM user. You can use +// ChangePassword to update, but not delete, your own password in the My Security +// Credentials page in the Amazon Web Services Management Console. Deleting a +// user's password does not prevent a user from accessing Amazon Web Services +// through the command line interface or the API. To prevent all user access, you +// must also either make any access keys inactive or delete them. For more +// information about making keys inactive or deleting them, see UpdateAccessKey and +// DeleteAccessKey. func (c *Client) DeleteLoginProfile(ctx context.Context, params *DeleteLoginProfileInput, optFns ...func(*Options)) (*DeleteLoginProfileOutput, error) { if params == nil { params = &DeleteLoginProfileInput{} diff --git a/service/iam/api_op_DeleteSigningCertificate.go b/service/iam/api_op_DeleteSigningCertificate.go index 88ba2490aee..765ae8ae9d8 100644 --- a/service/iam/api_op_DeleteSigningCertificate.go +++ b/service/iam/api_op_DeleteSigningCertificate.go @@ -13,9 +13,9 @@ import ( // Deletes a signing certificate associated with the specified IAM user. If you do // not specify a user name, IAM determines the user name implicitly based on the // Amazon Web Services access key ID signing the request. This operation works for -// access keys under the account. Consequently, you can use this operation to -// manage account root user credentials even if the account has no associated IAM -// users. +// access keys under the Amazon Web Services account. Consequently, you can use +// this operation to manage Amazon Web Services account root user credentials even +// if the Amazon Web Services account has no associated IAM users. func (c *Client) DeleteSigningCertificate(ctx context.Context, params *DeleteSigningCertificateInput, optFns ...func(*Options)) (*DeleteSigningCertificateOutput, error) { if params == nil { params = &DeleteSigningCertificateInput{} diff --git a/service/iam/api_op_DeleteUser.go b/service/iam/api_op_DeleteUser.go index 026b370e941..47b3277f7fc 100644 --- a/service/iam/api_op_DeleteUser.go +++ b/service/iam/api_op_DeleteUser.go @@ -10,9 +10,10 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Deletes the specified IAM user. Unlike the Management Console, when you delete a -// user programmatically, you must delete the items attached to the user manually, -// or the deletion fails. For more information, see Deleting an IAM user +// Deletes the specified IAM user. Unlike the Amazon Web Services Management +// Console, when you delete a user programmatically, you must delete the items +// attached to the user manually, or the deletion fails. For more information, see +// Deleting an IAM user // (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_users_manage.html#id_users_deleting_cli). // Before attempting to delete a user, remove the following items: // diff --git a/service/iam/api_op_GenerateCredentialReport.go b/service/iam/api_op_GenerateCredentialReport.go index 53ed349feb7..d62f104f3cb 100644 --- a/service/iam/api_op_GenerateCredentialReport.go +++ b/service/iam/api_op_GenerateCredentialReport.go @@ -11,8 +11,8 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Generates a credential report for the account. For more information about the -// credential report, see Getting credential reports +// Generates a credential report for the Amazon Web Services account. For more +// information about the credential report, see Getting credential reports // (https://docs.aws.amazon.com/IAM/latest/UserGuide/credential-reports.html) in // the IAM User Guide. func (c *Client) GenerateCredentialReport(ctx context.Context, params *GenerateCredentialReportInput, optFns ...func(*Options)) (*GenerateCredentialReportOutput, error) { diff --git a/service/iam/api_op_GenerateOrganizationsAccessReport.go b/service/iam/api_op_GenerateOrganizationsAccessReport.go index 794ccc47d95..376ee3e1ed3 100644 --- a/service/iam/api_op_GenerateOrganizationsAccessReport.go +++ b/service/iam/api_op_GenerateOrganizationsAccessReport.go @@ -33,13 +33,13 @@ import ( // (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_access-advisor.html) // in the IAM User Guide. The data includes all attempts to access Amazon Web // Services, not just the successful ones. This includes all attempts that were -// made using the Management Console, the Amazon Web Services API through any of -// the SDKs, or any of the command line tools. An unexpected entry in the service -// last accessed data does not mean that an account has been compromised, because -// the request might have been denied. Refer to your CloudTrail logs as the -// authoritative source for information about all API calls and whether they were -// successful or denied access. For more information, see Logging IAM events with -// CloudTrail +// made using the Amazon Web Services Management Console, the Amazon Web Services +// API through any of the SDKs, or any of the command line tools. An unexpected +// entry in the service last accessed data does not mean that an account has been +// compromised, because the request might have been denied. Refer to your +// CloudTrail logs as the authoritative source for information about all API calls +// and whether they were successful or denied access. For more information, see +// Logging IAM events with CloudTrail // (https://docs.aws.amazon.com/IAM/latest/UserGuide/cloudtrail-integration.html) // in the IAM User Guide. This operation returns a JobId. Use this parameter in the // GetOrganizationsAccessReport operation to check the status of the report diff --git a/service/iam/api_op_GenerateServiceLastAccessedDetails.go b/service/iam/api_op_GenerateServiceLastAccessedDetails.go index 5d7c39426e3..975d7005926 100644 --- a/service/iam/api_op_GenerateServiceLastAccessedDetails.go +++ b/service/iam/api_op_GenerateServiceLastAccessedDetails.go @@ -20,13 +20,13 @@ import ( // (https://docs.aws.amazon.com/IAM/latest/UserGuide/access_policies_access-advisor.html#access-advisor_tracking-period). // The service last accessed data includes all attempts to access an Amazon Web // Services API, not just the successful ones. This includes all attempts that were -// made using the Management Console, the Amazon Web Services API through any of -// the SDKs, or any of the command line tools. An unexpected entry in the service -// last accessed data does not mean that your account has been compromised, because -// the request might have been denied. Refer to your CloudTrail logs as the -// authoritative source for information about all API calls and whether they were -// successful or denied access. For more information, see Logging IAM events with -// CloudTrail +// made using the Amazon Web Services Management Console, the Amazon Web Services +// API through any of the SDKs, or any of the command line tools. An unexpected +// entry in the service last accessed data does not mean that your account has been +// compromised, because the request might have been denied. Refer to your +// CloudTrail logs as the authoritative source for information about all API calls +// and whether they were successful or denied access. For more information, see +// Logging IAM events with CloudTrail // (https://docs.aws.amazon.com/IAM/latest/UserGuide/cloudtrail-integration.html) // in the IAM User Guide. The GenerateServiceLastAccessedDetails operation returns // a JobId. Use this parameter in the following operations to retrieve the diff --git a/service/iam/api_op_GetAccountPasswordPolicy.go b/service/iam/api_op_GetAccountPasswordPolicy.go index e982254ea56..0e1bb1d4527 100644 --- a/service/iam/api_op_GetAccountPasswordPolicy.go +++ b/service/iam/api_op_GetAccountPasswordPolicy.go @@ -11,10 +11,10 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Retrieves the password policy for the account. This tells you the complexity -// requirements and mandatory rotation periods for the IAM user passwords in your -// account. For more information about using a password policy, see Managing an IAM -// password policy +// Retrieves the password policy for the Amazon Web Services account. This tells +// you the complexity requirements and mandatory rotation periods for the IAM user +// passwords in your account. For more information about using a password policy, +// see Managing an IAM password policy // (https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingPasswordPolicies.html). func (c *Client) GetAccountPasswordPolicy(ctx context.Context, params *GetAccountPasswordPolicyInput, optFns ...func(*Options)) (*GetAccountPasswordPolicyOutput, error) { if params == nil { diff --git a/service/iam/api_op_GetCredentialReport.go b/service/iam/api_op_GetCredentialReport.go index 3aaba63bc43..b8b66d7fa2a 100644 --- a/service/iam/api_op_GetCredentialReport.go +++ b/service/iam/api_op_GetCredentialReport.go @@ -12,8 +12,8 @@ import ( "time" ) -// Retrieves a credential report for the account. For more information about the -// credential report, see Getting credential reports +// Retrieves a credential report for the Amazon Web Services account. For more +// information about the credential report, see Getting credential reports // (https://docs.aws.amazon.com/IAM/latest/UserGuide/credential-reports.html) in // the IAM User Guide. func (c *Client) GetCredentialReport(ctx context.Context, params *GetCredentialReportInput, optFns ...func(*Options)) (*GetCredentialReportOutput, error) { diff --git a/service/iam/api_op_GetLoginProfile.go b/service/iam/api_op_GetLoginProfile.go index bfed8e7b575..2186c9ec4d0 100644 --- a/service/iam/api_op_GetLoginProfile.go +++ b/service/iam/api_op_GetLoginProfile.go @@ -12,15 +12,15 @@ import ( ) // Retrieves the user name for the specified IAM user. A login profile is created -// when you create a password for the user to access the Management Console. If the -// user does not exist or does not have a password, the operation returns a 404 -// (NoSuchEntity) error. If you create an IAM user with access to the console, the -// CreateDate reflects the date you created the initial password for the user. If -// you create an IAM user with programmatic access, and then later add a password -// for the user to access the Management Console, the CreateDate reflects the -// initial password creation date. A user with programmatic access does not have a -// login profile unless you create a password for the user to access the Management -// Console. +// when you create a password for the user to access the Amazon Web Services +// Management Console. If the user does not exist or does not have a password, the +// operation returns a 404 (NoSuchEntity) error. If you create an IAM user with +// access to the console, the CreateDate reflects the date you created the initial +// password for the user. If you create an IAM user with programmatic access, and +// then later add a password for the user to access the Amazon Web Services +// Management Console, the CreateDate reflects the initial password creation date. +// A user with programmatic access does not have a login profile unless you create +// a password for the user to access the Amazon Web Services Management Console. func (c *Client) GetLoginProfile(ctx context.Context, params *GetLoginProfileInput, optFns ...func(*Options)) (*GetLoginProfileOutput, error) { if params == nil { params = &GetLoginProfileInput{} diff --git a/service/iam/api_op_GetOpenIDConnectProvider.go b/service/iam/api_op_GetOpenIDConnectProvider.go index 99a36787e31..fd0b79dc28a 100644 --- a/service/iam/api_op_GetOpenIDConnectProvider.go +++ b/service/iam/api_op_GetOpenIDConnectProvider.go @@ -53,7 +53,7 @@ type GetOpenIDConnectProviderOutput struct { ClientIDList []string // The date and time when the IAM OIDC provider resource object was created in the - // account. + // Amazon Web Services account. CreateDate *time.Time // A list of tags that are attached to the specified IAM OIDC provider. The diff --git a/service/iam/api_op_ListAccessKeys.go b/service/iam/api_op_ListAccessKeys.go index d84afbf4215..0317aaa0a3f 100644 --- a/service/iam/api_op_ListAccessKeys.go +++ b/service/iam/api_op_ListAccessKeys.go @@ -18,10 +18,11 @@ import ( // the MaxItems and Marker parameters. If the UserName field is not specified, the // user name is determined implicitly based on the Amazon Web Services access key // ID used to sign the request. This operation works for access keys under the -// account. Consequently, you can use this operation to manage account root user -// credentials even if the account has no associated users. To ensure the security -// of your account, the secret access key is accessible only during key and user -// creation. +// Amazon Web Services account. Consequently, you can use this operation to manage +// Amazon Web Services account root user credentials even if the Amazon Web +// Services account has no associated users. To ensure the security of your Amazon +// Web Services account, the secret access key is accessible only during key and +// user creation. func (c *Client) ListAccessKeys(ctx context.Context, params *ListAccessKeysInput, optFns ...func(*Options)) (*ListAccessKeysOutput, error) { if params == nil { params = &ListAccessKeysInput{} diff --git a/service/iam/api_op_ListAccountAliases.go b/service/iam/api_op_ListAccountAliases.go index 95009995269..ab2baae5bb1 100644 --- a/service/iam/api_op_ListAccountAliases.go +++ b/service/iam/api_op_ListAccountAliases.go @@ -11,10 +11,11 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Lists the account alias associated with the account (Note: you can have only -// one). For information about using an account alias, see Using an alias for your -// account ID (https://docs.aws.amazon.com/IAM/latest/UserGuide/AccountAlias.html) -// in the IAM User Guide. +// Lists the account alias associated with the Amazon Web Services account (Note: +// you can have only one). For information about using an Amazon Web Services +// account alias, see Using an alias for your Amazon Web Services account ID +// (https://docs.aws.amazon.com/IAM/latest/UserGuide/AccountAlias.html) in the IAM +// User Guide. func (c *Client) ListAccountAliases(ctx context.Context, params *ListAccountAliasesInput, optFns ...func(*Options)) (*ListAccountAliasesOutput, error) { if params == nil { params = &ListAccountAliasesInput{} diff --git a/service/iam/api_op_ListOpenIDConnectProviders.go b/service/iam/api_op_ListOpenIDConnectProviders.go index 9f8aa048227..64c9f28cc0c 100644 --- a/service/iam/api_op_ListOpenIDConnectProviders.go +++ b/service/iam/api_op_ListOpenIDConnectProviders.go @@ -12,10 +12,11 @@ import ( ) // Lists information about the IAM OpenID Connect (OIDC) provider resource objects -// defined in the account. IAM resource-listing operations return a subset of the -// available attributes for the resource. For example, this operation does not -// return tags, even though they are an attribute of the returned object. To view -// all of the information for an OIDC provider, see GetOpenIDConnectProvider. +// defined in the Amazon Web Services account. IAM resource-listing operations +// return a subset of the available attributes for the resource. For example, this +// operation does not return tags, even though they are an attribute of the +// returned object. To view all of the information for an OIDC provider, see +// GetOpenIDConnectProvider. func (c *Client) ListOpenIDConnectProviders(ctx context.Context, params *ListOpenIDConnectProvidersInput, optFns ...func(*Options)) (*ListOpenIDConnectProvidersOutput, error) { if params == nil { params = &ListOpenIDConnectProvidersInput{} @@ -38,7 +39,8 @@ type ListOpenIDConnectProvidersInput struct { // Contains the response to a successful ListOpenIDConnectProviders request. type ListOpenIDConnectProvidersOutput struct { - // The list of IAM OIDC provider resource objects defined in the account. + // The list of IAM OIDC provider resource objects defined in the Amazon Web + // Services account. OpenIDConnectProviderList []types.OpenIDConnectProviderListEntry // Metadata pertaining to the operation's result. diff --git a/service/iam/api_op_ListPolicies.go b/service/iam/api_op_ListPolicies.go index 845969a72f8..28069abdb5f 100644 --- a/service/iam/api_op_ListPolicies.go +++ b/service/iam/api_op_ListPolicies.go @@ -12,14 +12,14 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Lists all the managed policies that are available in your account, including -// your own customer-defined managed policies and all Amazon Web Services managed -// policies. You can filter the list of policies that is returned using the -// optional OnlyAttached, Scope, and PathPrefix parameters. For example, to list -// only the customer managed policies in your Amazon Web Services account, set -// Scope to Local. To list only Amazon Web Services managed policies, set Scope to -// AWS. You can paginate the results using the MaxItems and Marker parameters. For -// more information about managed policies, see Managed policies and inline +// Lists all the managed policies that are available in your Amazon Web Services +// account, including your own customer-defined managed policies and all Amazon Web +// Services managed policies. You can filter the list of policies that is returned +// using the optional OnlyAttached, Scope, and PathPrefix parameters. For example, +// to list only the customer managed policies in your Amazon Web Services account, +// set Scope to Local. To list only Amazon Web Services managed policies, set Scope +// to AWS. You can paginate the results using the MaxItems and Marker parameters. +// For more information about managed policies, see Managed policies and inline // policies // (https://docs.aws.amazon.com/IAM/latest/UserGuide/policies-managed-vs-inline.html) // in the IAM User Guide. IAM resource-listing operations return a subset of the @@ -82,8 +82,9 @@ type ListPoliciesInput struct { // The scope to use for filtering the results. To list only Amazon Web Services // managed policies, set Scope to AWS. To list only the customer managed policies - // in your account, set Scope to Local. This parameter is optional. If it is not - // included, or if it is set to All, all policies are returned. + // in your Amazon Web Services account, set Scope to Local. This parameter is + // optional. If it is not included, or if it is set to All, all policies are + // returned. Scope types.PolicyScopeType noSmithyDocumentSerde diff --git a/service/iam/api_op_ListSigningCertificates.go b/service/iam/api_op_ListSigningCertificates.go index 527590853d8..b06160a8458 100644 --- a/service/iam/api_op_ListSigningCertificates.go +++ b/service/iam/api_op_ListSigningCertificates.go @@ -18,9 +18,10 @@ import ( // paginate the results using the MaxItems and Marker parameters. If the UserName // field is not specified, the user name is determined implicitly based on the // Amazon Web Services access key ID used to sign the request for this operation. -// This operation works for access keys under the account. Consequently, you can -// use this operation to manage account root user credentials even if the account -// has no associated users. +// This operation works for access keys under the Amazon Web Services account. +// Consequently, you can use this operation to manage Amazon Web Services account +// root user credentials even if the Amazon Web Services account has no associated +// users. func (c *Client) ListSigningCertificates(ctx context.Context, params *ListSigningCertificatesInput, optFns ...func(*Options)) (*ListSigningCertificatesOutput, error) { if params == nil { params = &ListSigningCertificatesInput{} diff --git a/service/iam/api_op_ListUsers.go b/service/iam/api_op_ListUsers.go index d5aaf0c51eb..0e46c40ae4d 100644 --- a/service/iam/api_op_ListUsers.go +++ b/service/iam/api_op_ListUsers.go @@ -13,12 +13,12 @@ import ( ) // Lists the IAM users that have the specified path prefix. If no path prefix is -// specified, the operation returns all users in the account. If there are none, -// the operation returns an empty list. IAM resource-listing operations return a -// subset of the available attributes for the resource. For example, this operation -// does not return tags, even though they are an attribute of the returned object. -// To view all of the information for a user, see GetUser. You can paginate the -// results using the MaxItems and Marker parameters. +// specified, the operation returns all users in the Amazon Web Services account. +// If there are none, the operation returns an empty list. IAM resource-listing +// operations return a subset of the available attributes for the resource. For +// example, this operation does not return tags, even though they are an attribute +// of the returned object. To view all of the information for a user, see GetUser. +// You can paginate the results using the MaxItems and Marker parameters. func (c *Client) ListUsers(ctx context.Context, params *ListUsersInput, optFns ...func(*Options)) (*ListUsersOutput, error) { if params == nil { params = &ListUsersInput{} diff --git a/service/iam/api_op_ListVirtualMFADevices.go b/service/iam/api_op_ListVirtualMFADevices.go index 64eae44eebc..9359f0c0d1f 100644 --- a/service/iam/api_op_ListVirtualMFADevices.go +++ b/service/iam/api_op_ListVirtualMFADevices.go @@ -12,14 +12,14 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Lists the virtual MFA devices defined in the account by assignment status. If -// you do not specify an assignment status, the operation returns a list of all -// virtual MFA devices. Assignment status can be Assigned, Unassigned, or Any. IAM -// resource-listing operations return a subset of the available attributes for the -// resource. For example, this operation does not return tags, even though they are -// an attribute of the returned object. To view all of the information for a -// virtual MFA device, see ListVirtualMFADevices. You can paginate the results -// using the MaxItems and Marker parameters. +// Lists the virtual MFA devices defined in the Amazon Web Services account by +// assignment status. If you do not specify an assignment status, the operation +// returns a list of all virtual MFA devices. Assignment status can be Assigned, +// Unassigned, or Any. IAM resource-listing operations return a subset of the +// available attributes for the resource. For example, this operation does not +// return tags, even though they are an attribute of the returned object. To view +// all of the information for a virtual MFA device, see ListVirtualMFADevices. You +// can paginate the results using the MaxItems and Marker parameters. func (c *Client) ListVirtualMFADevices(ctx context.Context, params *ListVirtualMFADevicesInput, optFns ...func(*Options)) (*ListVirtualMFADevicesOutput, error) { if params == nil { params = &ListVirtualMFADevicesInput{} diff --git a/service/iam/api_op_SetSecurityTokenServicePreferences.go b/service/iam/api_op_SetSecurityTokenServicePreferences.go index 0c63d90be8c..9c742f78960 100644 --- a/service/iam/api_op_SetSecurityTokenServicePreferences.go +++ b/service/iam/api_op_SetSecurityTokenServicePreferences.go @@ -12,21 +12,21 @@ import ( ) // Sets the specified version of the global endpoint token as the token version -// used for the account. By default, Security Token Service (STS) is available as a -// global service, and all STS requests go to a single endpoint at -// https://sts.amazonaws.com. Amazon Web Services recommends using Regional STS -// endpoints to reduce latency, build in redundancy, and increase session token -// availability. For information about Regional endpoints for STS, see Security -// Token Service endpoints and quotas +// used for the Amazon Web Services account. By default, Security Token Service +// (STS) is available as a global service, and all STS requests go to a single +// endpoint at https://sts.amazonaws.com. Amazon Web Services recommends using +// Regional STS endpoints to reduce latency, build in redundancy, and increase +// session token availability. For information about Regional endpoints for STS, +// see Security Token Service endpoints and quotas // (https://docs.aws.amazon.com/general/latest/gr/sts.html) in the Amazon Web // Services General Reference. If you make an STS call to the global endpoint, the // resulting session tokens might be valid in some Regions but not others. It // depends on the version that is set in this operation. Version 1 tokens are valid -// only in Regions that are available by default. These tokens do not work in -// manually enabled Regions, such as Asia Pacific (Hong Kong). Version 2 tokens are -// valid in all Regions. However, version 2 tokens are longer and might affect -// systems where you temporarily store tokens. For information, see Activating and -// deactivating STS in an Region +// only in Amazon Web Services Regions that are available by default. These tokens +// do not work in manually enabled Regions, such as Asia Pacific (Hong Kong). +// Version 2 tokens are valid in all Regions. However, version 2 tokens are longer +// and might affect systems where you temporarily store tokens. For information, +// see Activating and deactivating STS in an Amazon Web Services Region // (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html) // in the IAM User Guide. To view the current session token version, see the // GlobalEndpointTokenVersion entry in the response of the GetAccountSummary @@ -49,11 +49,11 @@ func (c *Client) SetSecurityTokenServicePreferences(ctx context.Context, params type SetSecurityTokenServicePreferencesInput struct { // The version of the global endpoint token. Version 1 tokens are valid only in - // Regions that are available by default. These tokens do not work in manually - // enabled Regions, such as Asia Pacific (Hong Kong). Version 2 tokens are valid in - // all Regions. However, version 2 tokens are longer and might affect systems where - // you temporarily store tokens. For information, see Activating and deactivating - // STS in an Region + // Amazon Web Services Regions that are available by default. These tokens do not + // work in manually enabled Regions, such as Asia Pacific (Hong Kong). Version 2 + // tokens are valid in all Regions. However, version 2 tokens are longer and might + // affect systems where you temporarily store tokens. For information, see + // Activating and deactivating STS in an Amazon Web Services Region // (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_enable-regions.html) // in the IAM User Guide. // diff --git a/service/iam/api_op_SimulateCustomPolicy.go b/service/iam/api_op_SimulateCustomPolicy.go index ed8839510f2..e920c6ce6d2 100644 --- a/service/iam/api_op_SimulateCustomPolicy.go +++ b/service/iam/api_op_SimulateCustomPolicy.go @@ -189,13 +189,13 @@ type SimulateCustomPolicyInput struct { // subnet, volume ResourceHandlingOption *string - // An ARN representing the account ID that specifies the owner of any simulated - // resource that does not identify its owner in the resource ARN. Examples of - // resource ARNs include an S3 bucket or object. If ResourceOwner is specified, it - // is also used as the account owner of any ResourcePolicy included in the - // simulation. If the ResourceOwner parameter is not specified, then the owner of - // the resources and the resource policy defaults to the account of the identity - // provided in CallerArn. This parameter is required only if you specify a + // An ARN representing the Amazon Web Services account ID that specifies the owner + // of any simulated resource that does not identify its owner in the resource ARN. + // Examples of resource ARNs include an S3 bucket or object. If ResourceOwner is + // specified, it is also used as the account owner of any ResourcePolicy included + // in the simulation. If the ResourceOwner parameter is not specified, then the + // owner of the resources and the resource policy defaults to the account of the + // identity provided in CallerArn. This parameter is required only if you specify a // resource-based policy and account that owns the resource is different from the // account that owns the simulated calling user CallerArn. The ARN for an account // uses the following syntax: arn:aws:iam::AWS-account-ID:root. For example, to diff --git a/service/iam/api_op_SimulatePrincipalPolicy.go b/service/iam/api_op_SimulatePrincipalPolicy.go index 7918edea7ea..78b97c0e9ad 100644 --- a/service/iam/api_op_SimulatePrincipalPolicy.go +++ b/service/iam/api_op_SimulatePrincipalPolicy.go @@ -208,15 +208,15 @@ type SimulatePrincipalPolicyInput struct { // subnet, volume ResourceHandlingOption *string - // An account ID that specifies the owner of any simulated resource that does not - // identify its owner in the resource ARN. Examples of resource ARNs include an S3 - // bucket or object. If ResourceOwner is specified, it is also used as the account - // owner of any ResourcePolicy included in the simulation. If the ResourceOwner - // parameter is not specified, then the owner of the resources and the resource - // policy defaults to the account of the identity provided in CallerArn. This - // parameter is required only if you specify a resource-based policy and account - // that owns the resource is different from the account that owns the simulated - // calling user CallerArn. + // An Amazon Web Services account ID that specifies the owner of any simulated + // resource that does not identify its owner in the resource ARN. Examples of + // resource ARNs include an S3 bucket or object. If ResourceOwner is specified, it + // is also used as the account owner of any ResourcePolicy included in the + // simulation. If the ResourceOwner parameter is not specified, then the owner of + // the resources and the resource policy defaults to the account of the identity + // provided in CallerArn. This parameter is required only if you specify a + // resource-based policy and account that owns the resource is different from the + // account that owns the simulated calling user CallerArn. ResourceOwner *string // A resource-based policy to include in the simulation provided as a string. Each diff --git a/service/iam/api_op_UpdateAccessKey.go b/service/iam/api_op_UpdateAccessKey.go index 50c73213f8f..b4115bf598d 100644 --- a/service/iam/api_op_UpdateAccessKey.go +++ b/service/iam/api_op_UpdateAccessKey.go @@ -15,10 +15,11 @@ import ( // versa. This operation can be used to disable a user's key as part of a key // rotation workflow. If the UserName is not specified, the user name is determined // implicitly based on the Amazon Web Services access key ID used to sign the -// request. This operation works for access keys under the account. Consequently, -// you can use this operation to manage account root user credentials even if the -// account has no associated users. For information about rotating keys, see -// Managing keys and certificates +// request. This operation works for access keys under the Amazon Web Services +// account. Consequently, you can use this operation to manage Amazon Web Services +// account root user credentials even if the Amazon Web Services account has no +// associated users. For information about rotating keys, see Managing keys and +// certificates // (https://docs.aws.amazon.com/IAM/latest/UserGuide/ManagingCredentials.html) in // the IAM User Guide. func (c *Client) UpdateAccessKey(ctx context.Context, params *UpdateAccessKeyInput, optFns ...func(*Options)) (*UpdateAccessKeyOutput, error) { diff --git a/service/iam/api_op_UpdateAccountPasswordPolicy.go b/service/iam/api_op_UpdateAccountPasswordPolicy.go index 940e3cb3dc3..eaa17461009 100644 --- a/service/iam/api_op_UpdateAccountPasswordPolicy.go +++ b/service/iam/api_op_UpdateAccountPasswordPolicy.go @@ -10,18 +10,18 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Updates the password policy settings for the account. +// Updates the password policy settings for the Amazon Web Services account. // -// * This operation does not -// support partial updates. No parameters are required, but if you do not specify a -// parameter, that parameter's value reverts to its default value. See the Request -// Parameters section for each parameter's default value. Also note that some -// parameters do not allow the default parameter to be explicitly set. Instead, to -// invoke the default value, do not include that parameter when you invoke the -// operation. +// * +// This operation does not support partial updates. No parameters are required, but +// if you do not specify a parameter, that parameter's value reverts to its default +// value. See the Request Parameters section for each parameter's default value. +// Also note that some parameters do not allow the default parameter to be +// explicitly set. Instead, to invoke the default value, do not include that +// parameter when you invoke the operation. // -// For more information about using a password policy, see Managing an -// IAM password policy +// For more information about using a +// password policy, see Managing an IAM password policy // (https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingPasswordPolicies.html) // in the IAM User Guide. func (c *Client) UpdateAccountPasswordPolicy(ctx context.Context, params *UpdateAccountPasswordPolicyInput, optFns ...func(*Options)) (*UpdateAccountPasswordPolicyOutput, error) { @@ -41,9 +41,9 @@ func (c *Client) UpdateAccountPasswordPolicy(ctx context.Context, params *Update type UpdateAccountPasswordPolicyInput struct { - // Allows all IAM users in your account to use the Management Console to change - // their own passwords. For more information, see Letting IAM users change their - // own passwords + // Allows all IAM users in your account to use the Amazon Web Services Management + // Console to change their own passwords. For more information, see Letting IAM + // users change their own passwords // (https://docs.aws.amazon.com/IAM/latest/UserGuide/HowToPwdIAMUser.html) in the // IAM User Guide. If you do not specify a value for this parameter, then the // operation uses the default value of false. The result is that IAM users in the diff --git a/service/iam/api_op_UpdateLoginProfile.go b/service/iam/api_op_UpdateLoginProfile.go index 2dae3fdb379..f84d0c6730e 100644 --- a/service/iam/api_op_UpdateLoginProfile.go +++ b/service/iam/api_op_UpdateLoginProfile.go @@ -13,8 +13,8 @@ import ( // Changes the password for the specified IAM user. You can use the CLI, the Amazon // Web Services API, or the Users page in the IAM console to change the password // for any IAM user. Use ChangePassword to change your own password in the My -// Security Credentials page in the Management Console. For more information about -// modifying passwords, see Managing passwords +// Security Credentials page in the Amazon Web Services Management Console. For +// more information about modifying passwords, see Managing passwords // (https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_ManagingLogins.html) in // the IAM User Guide. func (c *Client) UpdateLoginProfile(ctx context.Context, params *UpdateLoginProfileInput, optFns ...func(*Options)) (*UpdateLoginProfileOutput, error) { @@ -58,7 +58,8 @@ type UpdateLoginProfileInput struct { // // However, the format can be further // restricted by the account administrator by setting a password policy on the - // account. For more information, see UpdateAccountPasswordPolicy. + // Amazon Web Services account. For more information, see + // UpdateAccountPasswordPolicy. Password *string // Allows this new password to be used only once by requiring the specified IAM diff --git a/service/iam/api_op_UpdateSigningCertificate.go b/service/iam/api_op_UpdateSigningCertificate.go index a738f362c99..1098478dc92 100644 --- a/service/iam/api_op_UpdateSigningCertificate.go +++ b/service/iam/api_op_UpdateSigningCertificate.go @@ -16,9 +16,9 @@ import ( // signing certificate as part of a certificate rotation work flow. If the UserName // field is not specified, the user name is determined implicitly based on the // Amazon Web Services access key ID used to sign the request. This operation works -// for access keys under the account. Consequently, you can use this operation to -// manage account root user credentials even if the account has no associated -// users. +// for access keys under the Amazon Web Services account. Consequently, you can use +// this operation to manage Amazon Web Services account root user credentials even +// if the Amazon Web Services account has no associated users. func (c *Client) UpdateSigningCertificate(ctx context.Context, params *UpdateSigningCertificateInput, optFns ...func(*Options)) (*UpdateSigningCertificateOutput, error) { if params == nil { params = &UpdateSigningCertificateInput{} diff --git a/service/iam/api_op_UploadServerCertificate.go b/service/iam/api_op_UploadServerCertificate.go index dc7712659ce..38fdddc3079 100644 --- a/service/iam/api_op_UploadServerCertificate.go +++ b/service/iam/api_op_UploadServerCertificate.go @@ -11,14 +11,14 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Uploads a server certificate entity for the account. The server certificate -// entity includes a public key certificate, a private key, and an optional -// certificate chain, which should all be PEM-encoded. We recommend that you use -// Certificate Manager (https://docs.aws.amazon.com/acm/) to provision, manage, and -// deploy your server certificates. With ACM you can request a certificate, deploy -// it to Amazon Web Services resources, and let ACM handle certificate renewals for -// you. Certificates provided by ACM are free. For more information about using -// ACM, see the Certificate Manager User Guide +// Uploads a server certificate entity for the Amazon Web Services account. The +// server certificate entity includes a public key certificate, a private key, and +// an optional certificate chain, which should all be PEM-encoded. We recommend +// that you use Certificate Manager (https://docs.aws.amazon.com/acm/) to +// provision, manage, and deploy your server certificates. With ACM you can request +// a certificate, deploy it to Amazon Web Services resources, and let ACM handle +// certificate renewals for you. Certificates provided by ACM are free. For more +// information about using ACM, see the Certificate Manager User Guide // (https://docs.aws.amazon.com/acm/latest/userguide/). For more information about // working with server certificates, see Working with server certificates // (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html) diff --git a/service/iam/api_op_UploadSigningCertificate.go b/service/iam/api_op_UploadSigningCertificate.go index f258a965ecf..98daec8a3a3 100644 --- a/service/iam/api_op_UploadSigningCertificate.go +++ b/service/iam/api_op_UploadSigningCertificate.go @@ -20,12 +20,13 @@ import ( // (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_server-certs.html) // in the IAM User Guide. If the UserName is not specified, the IAM user name is // determined implicitly based on the Amazon Web Services access key ID used to -// sign the request. This operation works for access keys under the account. -// Consequently, you can use this operation to manage account root user credentials -// even if the account has no associated users. Because the body of an X.509 -// certificate can be large, you should use POST rather than GET when calling -// UploadSigningCertificate. For information about setting up signatures and -// authorization through the API, see Signing Amazon Web Services API requests +// sign the request. This operation works for access keys under the Amazon Web +// Services account. Consequently, you can use this operation to manage Amazon Web +// Services account root user credentials even if the Amazon Web Services account +// has no associated users. Because the body of an X.509 certificate can be large, +// you should use POST rather than GET when calling UploadSigningCertificate. For +// information about setting up signatures and authorization through the API, see +// Signing Amazon Web Services API requests // (https://docs.aws.amazon.com/general/latest/gr/signing_aws_api_requests.html) in // the Amazon Web Services General Reference. For general information about using // the Query API with IAM, see Making query requests diff --git a/service/iam/types/types.go b/service/iam/types/types.go index ed3b8c8bc52..b6228ab52b7 100644 --- a/service/iam/types/types.go +++ b/service/iam/types/types.go @@ -117,21 +117,21 @@ type AccessKeyLastUsed struct { // This member is required. LastUsedDate *time.Time - // The Region where this access key was most recently used. The value for this - // field is "N/A" in the following situations: + // The Amazon Web Services Region where this access key was most recently used. The + // value for this field is "N/A" in the following situations: // - // * The user does not have an access - // key. + // * The user does not + // have an access key. // - // * An access key exists but has not been used since IAM began tracking this - // information. + // * An access key exists but has not been used since IAM + // began tracking this information. // - // * There is no sign-in data associated with the user. + // * There is no sign-in data associated with the + // user. // - // For more - // information about Regions, see Regions and endpoints - // (https://docs.aws.amazon.com/general/latest/gr/rande.html) in the Amazon Web - // Services General Reference. + // For more information about Amazon Web Services Regions, see Regions and + // endpoints (https://docs.aws.amazon.com/general/latest/gr/rande.html) in the + // Amazon Web Services General Reference. // // This member is required. Region *string @@ -583,8 +583,8 @@ type LoginProfile struct { // This member is required. CreateDate *time.Time - // The name of the user, which can be used for signing in to the Management - // Console. + // The name of the user, which can be used for signing in to the Amazon Web + // Services Management Console. // // This member is required. UserName *string @@ -1219,7 +1219,7 @@ type RoleLastUsed struct { // in the IAM User Guide. LastUsedDate *time.Time - // The name of the Region in which the role was last used. + // The name of the Amazon Web Services Region in which the role was last used. Region *string noSmithyDocumentSerde diff --git a/service/identitystore/internal/endpoints/endpoints.go b/service/identitystore/internal/endpoints/endpoints.go index 9a5366f36de..1d021031d4f 100644 --- a/service/identitystore/internal/endpoints/endpoints.go +++ b/service/identitystore/internal/endpoints/endpoints.go @@ -117,5 +117,14 @@ var defaultPartitions = endpoints.Partitions{ }, RegionRegex: partitionRegexp.AwsUsGov, IsRegionalized: true, + Endpoints: endpoints.Endpoints{ + "fips-us-gov-west-1": endpoints.Endpoint{ + Hostname: "identitystore.us-gov-west-1.amazonaws.com", + CredentialScope: endpoints.CredentialScope{ + Region: "us-gov-west-1", + }, + }, + "us-gov-west-1": endpoints.Endpoint{}, + }, }, } diff --git a/service/imagebuilder/api_op_CreateComponent.go b/service/imagebuilder/api_op_CreateComponent.go index 8cd31a503f8..2211e2d7e1f 100644 --- a/service/imagebuilder/api_op_CreateComponent.go +++ b/service/imagebuilder/api_op_CreateComponent.go @@ -51,10 +51,10 @@ type CreateComponentInput struct { // first three, and can filter on all of them. Assignment: For the first three // nodes you can assign any positive integer value, including zero, with an upper // limit of 2^30-1, or 1073741823 for each node. Image Builder automatically - // assigns the build number, and that is not open for updates. Patterns: You can - // use any numeric pattern that adheres to the assignment requirements for the - // nodes that you can assign. For example, you might choose a software version - // pattern, such as 1.0.0, or a date, such as 2021.01.01. + // assigns the build number to the fourth node. Patterns: You can use any numeric + // pattern that adheres to the assignment requirements for the nodes that you can + // assign. For example, you might choose a software version pattern, such as 1.0.0, + // or a date, such as 2021.01.01. // // This member is required. SemanticVersion *string diff --git a/service/imagebuilder/api_op_CreateContainerRecipe.go b/service/imagebuilder/api_op_CreateContainerRecipe.go index 14ba6576369..9bcc011bd1c 100644 --- a/service/imagebuilder/api_op_CreateContainerRecipe.go +++ b/service/imagebuilder/api_op_CreateContainerRecipe.go @@ -61,10 +61,10 @@ type CreateContainerRecipeInput struct { // for the first three, and can filter on all of them. Assignment: For the first // three nodes you can assign any positive integer value, including zero, with an // upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically - // assigns the build number, and that is not open for updates. Patterns: You can - // use any numeric pattern that adheres to the assignment requirements for the - // nodes that you can assign. For example, you might choose a software version - // pattern, such as 1.0.0, or a date, such as 2021.01.01. + // assigns the build number to the fourth node. Patterns: You can use any numeric + // pattern that adheres to the assignment requirements for the nodes that you can + // assign. For example, you might choose a software version pattern, such as 1.0.0, + // or a date, such as 2021.01.01. // // This member is required. SemanticVersion *string diff --git a/service/imagebuilder/api_op_CreateImageRecipe.go b/service/imagebuilder/api_op_CreateImageRecipe.go index 15e3ae79680..282b4a7ecea 100644 --- a/service/imagebuilder/api_op_CreateImageRecipe.go +++ b/service/imagebuilder/api_op_CreateImageRecipe.go @@ -62,10 +62,10 @@ type CreateImageRecipeInput struct { // for the first three, and can filter on all of them. Assignment: For the first // three nodes you can assign any positive integer value, including zero, with an // upper limit of 2^30-1, or 1073741823 for each node. Image Builder automatically - // assigns the build number, and that is not open for updates. Patterns: You can - // use any numeric pattern that adheres to the assignment requirements for the - // nodes that you can assign. For example, you might choose a software version - // pattern, such as 1.0.0, or a date, such as 2021.01.01. + // assigns the build number to the fourth node. Patterns: You can use any numeric + // pattern that adheres to the assignment requirements for the nodes that you can + // assign. For example, you might choose a software version pattern, such as 1.0.0, + // or a date, such as 2021.01.01. // // This member is required. SemanticVersion *string diff --git a/service/imagebuilder/api_op_CreateInfrastructureConfiguration.go b/service/imagebuilder/api_op_CreateInfrastructureConfiguration.go index 0bb3ce73c43..f504e6c1139 100644 --- a/service/imagebuilder/api_op_CreateInfrastructureConfiguration.go +++ b/service/imagebuilder/api_op_CreateInfrastructureConfiguration.go @@ -50,12 +50,26 @@ type CreateInfrastructureConfigurationInput struct { // The description of the infrastructure configuration. Description *string - // The instance types of the infrastructure configuration. You can specify one or - // more instance types to use for this build. The service will pick one of these - // instance types based on availability. + // The instance metadata options that you can set for the HTTP requests that + // pipeline builds use to launch EC2 build and test instances. + InstanceMetadataOptions *types.InstanceMetadataOptions + + // The instance metadata options that you can set for the HTTP requests that + // pipeline builds use to launch EC2 build and test instances. For more information + // about instance metadata options, see one of the following links: + // + // * Configure + // the instance metadata options + // (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-options.html) + // in the Amazon EC2 User Guide for Linux instances. + // + // * Configure the instance + // metadata options + // (https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/configuring-instance-metadata-options.html) + // in the Amazon EC2 Windows Guide for Windows instances. InstanceTypes []string - // The key pair of the infrastructure configuration. This can be used to log on to + // The key pair of the infrastructure configuration. You can use this to log on to // and debug the instance used to create your image. KeyPair *string diff --git a/service/imagebuilder/api_op_DeleteImage.go b/service/imagebuilder/api_op_DeleteImage.go index 57a790d6525..c0056445293 100644 --- a/service/imagebuilder/api_op_DeleteImage.go +++ b/service/imagebuilder/api_op_DeleteImage.go @@ -10,7 +10,25 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Deletes an image. +// Deletes an Image Builder image resource. This does not delete any EC2 AMIs or +// ECR container images that are created during the image build process. You must +// clean those up separately, using the appropriate Amazon EC2 or Amazon ECR +// console actions, or API or CLI commands. +// +// * To deregister an EC2 Linux AMI, see +// Deregister your Linux AMI +// (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/deregister-ami.html) in the +// Amazon EC2 User Guide . +// +// * To deregister an EC2 Windows AMI, see Deregister your +// Windows AMI +// (https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/deregister-ami.html) in +// the Amazon EC2 Windows Guide . +// +// * To delete a container image from Amazon ECR, +// see Deleting an image +// (https://docs.aws.amazon.com/https:/docs.aws.amazon.comAmazonECR/latest/userguide/delete_image.html) +// in the Amazon ECR User Guide. func (c *Client) DeleteImage(ctx context.Context, params *DeleteImageInput, optFns ...func(*Options)) (*DeleteImageOutput, error) { if params == nil { params = &DeleteImageInput{} @@ -28,7 +46,7 @@ func (c *Client) DeleteImage(ctx context.Context, params *DeleteImageInput, optF type DeleteImageInput struct { - // The Amazon Resource Name (ARN) of the image to delete. + // The Amazon Resource Name (ARN) of the Image Builder image resource to delete. // // This member is required. ImageBuildVersionArn *string @@ -38,7 +56,8 @@ type DeleteImageInput struct { type DeleteImageOutput struct { - // The Amazon Resource Name (ARN) of the image that was deleted. + // The Amazon Resource Name (ARN) of the Image Builder image resource that was + // deleted. ImageBuildVersionArn *string // The request ID that uniquely identifies this request. diff --git a/service/imagebuilder/api_op_ImportComponent.go b/service/imagebuilder/api_op_ImportComponent.go index e768c2a4759..d7525a5fd36 100644 --- a/service/imagebuilder/api_op_ImportComponent.go +++ b/service/imagebuilder/api_op_ImportComponent.go @@ -52,13 +52,11 @@ type ImportComponentInput struct { // The semantic version of the component. This version follows the semantic version // syntax. The semantic version has four nodes: ../. You can assign values for the - // first three, and can filter on all of them. Filtering: When you retrieve or - // reference a resource with a semantic version, you can use wildcards (x) to - // filter your results. When you use a wildcard in any node, all nodes to the right - // of the first wildcard must also be wildcards. For example, specifying "1.2.x", - // or "1.x.x" works to filter list results, but neither "1.x.2", nor "x.2.x" will - // work. You do not have to specify the build - Image Builder automatically uses a - // wildcard for that, if applicable. + // first three, and can filter on all of them. Filtering: With semantic versioning, + // you have the flexibility to use wildcards (x) to specify the most recent + // versions or nodes when selecting the source image or components for your recipe. + // When you use a wildcard in any node, all nodes to the right of the first + // wildcard must also be wildcards. // // This member is required. SemanticVersion *string diff --git a/service/imagebuilder/api_op_ListComponentBuildVersions.go b/service/imagebuilder/api_op_ListComponentBuildVersions.go index 4d6f03e5c8a..e714774c668 100644 --- a/service/imagebuilder/api_op_ListComponentBuildVersions.go +++ b/service/imagebuilder/api_op_ListComponentBuildVersions.go @@ -14,13 +14,11 @@ import ( // Returns the list of component build versions for the specified semantic version. // The semantic version has four nodes: ../. You can assign values for the first -// three, and can filter on all of them. Filtering: When you retrieve or reference -// a resource with a semantic version, you can use wildcards (x) to filter your -// results. When you use a wildcard in any node, all nodes to the right of the -// first wildcard must also be wildcards. For example, specifying "1.2.x", or -// "1.x.x" works to filter list results, but neither "1.x.2", nor "x.2.x" will -// work. You do not have to specify the build - Image Builder automatically uses a -// wildcard for that, if applicable. +// three, and can filter on all of them. Filtering: With semantic versioning, you +// have the flexibility to use wildcards (x) to specify the most recent versions or +// nodes when selecting the source image or components for your recipe. When you +// use a wildcard in any node, all nodes to the right of the first wildcard must +// also be wildcards. func (c *Client) ListComponentBuildVersions(ctx context.Context, params *ListComponentBuildVersionsInput, optFns ...func(*Options)) (*ListComponentBuildVersionsOutput, error) { if params == nil { params = &ListComponentBuildVersionsInput{} diff --git a/service/imagebuilder/api_op_ListComponents.go b/service/imagebuilder/api_op_ListComponents.go index 3d60e64e045..c7b65565c10 100644 --- a/service/imagebuilder/api_op_ListComponents.go +++ b/service/imagebuilder/api_op_ListComponents.go @@ -14,13 +14,11 @@ import ( // Returns the list of component build versions for the specified semantic version. // The semantic version has four nodes: ../. You can assign values for the first -// three, and can filter on all of them. Filtering: When you retrieve or reference -// a resource with a semantic version, you can use wildcards (x) to filter your -// results. When you use a wildcard in any node, all nodes to the right of the -// first wildcard must also be wildcards. For example, specifying "1.2.x", or -// "1.x.x" works to filter list results, but neither "1.x.2", nor "x.2.x" will -// work. You do not have to specify the build - Image Builder automatically uses a -// wildcard for that, if applicable. +// three, and can filter on all of them. Filtering: With semantic versioning, you +// have the flexibility to use wildcards (x) to specify the most recent versions or +// nodes when selecting the source image or components for your recipe. When you +// use a wildcard in any node, all nodes to the right of the first wildcard must +// also be wildcards. func (c *Client) ListComponents(ctx context.Context, params *ListComponentsInput, optFns ...func(*Options)) (*ListComponentsOutput, error) { if params == nil { params = &ListComponentsInput{} diff --git a/service/imagebuilder/api_op_ListImagePackages.go b/service/imagebuilder/api_op_ListImagePackages.go index 116e88235cf..e36aaedfabf 100644 --- a/service/imagebuilder/api_op_ListImagePackages.go +++ b/service/imagebuilder/api_op_ListImagePackages.go @@ -13,7 +13,7 @@ import ( ) // List the Packages that are associated with an Image Build Version, as determined -// by Amazon EC2 Systems Manager Inventory at build time. +// by Amazon Web Services Systems Manager Inventory at build time. func (c *Client) ListImagePackages(ctx context.Context, params *ListImagePackagesInput, optFns ...func(*Options)) (*ListImagePackagesOutput, error) { if params == nil { params = &ListImagePackagesInput{} diff --git a/service/imagebuilder/api_op_ListImages.go b/service/imagebuilder/api_op_ListImages.go index 4336e3b2f27..4e1678f6070 100644 --- a/service/imagebuilder/api_op_ListImages.go +++ b/service/imagebuilder/api_op_ListImages.go @@ -70,12 +70,10 @@ type ListImagesOutput struct { // The list of image semantic versions. The semantic version has four nodes: ../. // You can assign values for the first three, and can filter on all of them. - // Filtering: When you retrieve or reference a resource with a semantic version, - // you can use wildcards (x) to filter your results. When you use a wildcard in any - // node, all nodes to the right of the first wildcard must also be wildcards. For - // example, specifying "1.2.x", or "1.x.x" works to filter list results, but - // neither "1.x.2", nor "x.2.x" will work. You do not have to specify the build - - // Image Builder automatically uses a wildcard for that, if applicable. + // Filtering: With semantic versioning, you have the flexibility to use wildcards + // (x) to specify the most recent versions or nodes when selecting the source image + // or components for your recipe. When you use a wildcard in any node, all nodes to + // the right of the first wildcard must also be wildcards. ImageVersionList []types.ImageVersion // The next token used for paginated responses. When this is not empty, there are diff --git a/service/imagebuilder/api_op_UpdateInfrastructureConfiguration.go b/service/imagebuilder/api_op_UpdateInfrastructureConfiguration.go index 0c00c3aae91..ed209c97ab6 100644 --- a/service/imagebuilder/api_op_UpdateInfrastructureConfiguration.go +++ b/service/imagebuilder/api_op_UpdateInfrastructureConfiguration.go @@ -51,12 +51,27 @@ type UpdateInfrastructureConfigurationInput struct { // The description of the infrastructure configuration. Description *string + // The instance metadata options that you can set for the HTTP requests that + // pipeline builds use to launch EC2 build and test instances. For more information + // about instance metadata options, see one of the following links: + // + // * Configure + // the instance metadata options + // (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-options.html) + // in the Amazon EC2 User Guide for Linux instances. + // + // * Configure the instance + // metadata options + // (https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/configuring-instance-metadata-options.html) + // in the Amazon EC2 Windows Guide for Windows instances. + InstanceMetadataOptions *types.InstanceMetadataOptions + // The instance types of the infrastructure configuration. You can specify one or // more instance types to use for this build. The service will pick one of these // instance types based on availability. InstanceTypes []string - // The key pair of the infrastructure configuration. This can be used to log on to + // The key pair of the infrastructure configuration. You can use this to log on to // and debug the instance used to create your image. KeyPair *string diff --git a/service/imagebuilder/deserializers.go b/service/imagebuilder/deserializers.go index 8d5aa43d905..9058e31b4d0 100644 --- a/service/imagebuilder/deserializers.go +++ b/service/imagebuilder/deserializers.go @@ -9846,6 +9846,11 @@ func awsRestjson1_deserializeDocumentComponent(v **types.Component, value interf sv.Platform = types.Platform(jtv) } + case "state": + if err := awsRestjson1_deserializeDocumentComponentState(&sv.State, value); err != nil { + return err + } + case "supportedOsVersions": if err := awsRestjson1_deserializeDocumentOsVersionList(&sv.SupportedOsVersions, value); err != nil { return err @@ -10174,6 +10179,55 @@ func awsRestjson1_deserializeDocumentComponentParameterValueList(v *[]string, va return nil } +func awsRestjson1_deserializeDocumentComponentState(v **types.ComponentState, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.ComponentState + if *v == nil { + sv = &types.ComponentState{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "reason": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected NonEmptyString to be of type string, got %T instead", value) + } + sv.Reason = ptr.String(jtv) + } + + case "status": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected ComponentStatus to be of type string, got %T instead", value) + } + sv.Status = types.ComponentStatus(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsRestjson1_deserializeDocumentComponentSummary(v **types.ComponentSummary, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -10259,6 +10313,11 @@ func awsRestjson1_deserializeDocumentComponentSummary(v **types.ComponentSummary sv.Platform = types.Platform(jtv) } + case "state": + if err := awsRestjson1_deserializeDocumentComponentState(&sv.State, value); err != nil { + return err + } + case "supportedOsVersions": if err := awsRestjson1_deserializeDocumentOsVersionList(&sv.SupportedOsVersions, value); err != nil { return err @@ -11286,6 +11345,19 @@ func awsRestjson1_deserializeDocumentEbsInstanceBlockDeviceSpecification(v **typ sv.SnapshotId = ptr.String(jtv) } + case "throughput": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected EbsVolumeThroughput to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.Throughput = ptr.Int32(int32(i64)) + } + case "volumeSize": if value != nil { jtv, ok := value.(json.Number) @@ -12561,6 +12633,11 @@ func awsRestjson1_deserializeDocumentInfrastructureConfiguration(v **types.Infra sv.Description = ptr.String(jtv) } + case "instanceMetadataOptions": + if err := awsRestjson1_deserializeDocumentInstanceMetadataOptions(&sv.InstanceMetadataOptions, value); err != nil { + return err + } + case "instanceProfileName": if value != nil { jtv, ok := value.(string) @@ -12925,6 +13002,59 @@ func awsRestjson1_deserializeDocumentInstanceConfiguration(v **types.InstanceCon return nil } +func awsRestjson1_deserializeDocumentInstanceMetadataOptions(v **types.InstanceMetadataOptions, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.InstanceMetadataOptions + if *v == nil { + sv = &types.InstanceMetadataOptions{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "httpPutResponseHopLimit": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected HttpPutResponseHopLimit to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.HttpPutResponseHopLimit = ptr.Int32(int32(i64)) + } + + case "httpTokens": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected HttpTokens to be of type string, got %T instead", value) + } + sv.HttpTokens = ptr.String(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsRestjson1_deserializeDocumentInstanceTypeList(v *[]string, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) diff --git a/service/imagebuilder/serializers.go b/service/imagebuilder/serializers.go index 5ccee4e49d9..71ccb2d629d 100644 --- a/service/imagebuilder/serializers.go +++ b/service/imagebuilder/serializers.go @@ -879,6 +879,13 @@ func awsRestjson1_serializeOpDocumentCreateInfrastructureConfigurationInput(v *C ok.String(*v.Description) } + if v.InstanceMetadataOptions != nil { + ok := object.Key("instanceMetadataOptions") + if err := awsRestjson1_serializeDocumentInstanceMetadataOptions(v.InstanceMetadataOptions, ok); err != nil { + return err + } + } + if v.InstanceProfileName != nil { ok := object.Key("instanceProfileName") ok.String(*v.InstanceProfileName) @@ -3799,6 +3806,13 @@ func awsRestjson1_serializeOpDocumentUpdateInfrastructureConfigurationInput(v *U ok.String(*v.InfrastructureConfigurationArn) } + if v.InstanceMetadataOptions != nil { + ok := object.Key("instanceMetadataOptions") + if err := awsRestjson1_serializeDocumentInstanceMetadataOptions(v.InstanceMetadataOptions, ok); err != nil { + return err + } + } + if v.InstanceProfileName != nil { ok := object.Key("instanceProfileName") ok.String(*v.InstanceProfileName) @@ -4111,6 +4125,11 @@ func awsRestjson1_serializeDocumentEbsInstanceBlockDeviceSpecification(v *types. ok.String(*v.SnapshotId) } + if v.Throughput != nil { + ok := object.Key("throughput") + ok.Integer(*v.Throughput) + } + if v.VolumeSize != nil { ok := object.Key("volumeSize") ok.Integer(*v.VolumeSize) @@ -4245,6 +4264,23 @@ func awsRestjson1_serializeDocumentInstanceConfiguration(v *types.InstanceConfig return nil } +func awsRestjson1_serializeDocumentInstanceMetadataOptions(v *types.InstanceMetadataOptions, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if v.HttpPutResponseHopLimit != nil { + ok := object.Key("httpPutResponseHopLimit") + ok.Integer(*v.HttpPutResponseHopLimit) + } + + if v.HttpTokens != nil { + ok := object.Key("httpTokens") + ok.String(*v.HttpTokens) + } + + return nil +} + func awsRestjson1_serializeDocumentInstanceTypeList(v []string, value smithyjson.Value) error { array := value.Array() defer array.Close() diff --git a/service/imagebuilder/types/enums.go b/service/imagebuilder/types/enums.go index 328a1c420f3..a19e89e251b 100644 --- a/service/imagebuilder/types/enums.go +++ b/service/imagebuilder/types/enums.go @@ -18,6 +18,22 @@ func (ComponentFormat) Values() []ComponentFormat { } } +type ComponentStatus string + +// Enum values for ComponentStatus +const ( + ComponentStatusDeprecated ComponentStatus = "DEPRECATED" +) + +// Values returns all known values for ComponentStatus. 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 (ComponentStatus) Values() []ComponentStatus { + return []ComponentStatus{ + "DEPRECATED", + } +} + type ComponentType string // Enum values for ComponentType diff --git a/service/imagebuilder/types/types.go b/service/imagebuilder/types/types.go index 2220fa0b2bf..09fd8babee9 100644 --- a/service/imagebuilder/types/types.go +++ b/service/imagebuilder/types/types.go @@ -8,19 +8,20 @@ import ( // In addition to your infrastruction configuration, these settings provide an // extra layer of control over your build instances. For instances where Image -// Builder installs the SSM agent, you can choose whether to keep it for the AMI -// that you create. You can also specify commands to run on launch for all of your -// build instances. +// Builder installs the Systems Manager agent, you can choose whether to keep it +// for the AMI that you create. You can also specify commands to run on launch for +// all of your build instances. type AdditionalInstanceConfiguration struct { - // Contains settings for the SSM agent on your build instance. + // Contains settings for the Systems Manager agent on your build instance. SystemsManagerAgent *SystemsManagerAgent // Use this property to provide commands or a command script to run when you launch // your build instance. The userDataOverride property replaces any commands that - // Image Builder might have added to ensure that SSM is installed on your Linux - // build instance. If you override the user data, make sure that you add commands - // to install SSM, if it is not pre-installed on your source image. + // Image Builder might have added to ensure that Systems Manager is installed on + // your Linux build instance. If you override the user data, make sure that you add + // commands to install Systems Manager, if it is not pre-installed on your source + // image. UserDataOverride *string noSmithyDocumentSerde @@ -114,6 +115,10 @@ type Component struct { // The platform of the component. Platform Platform + // Describes the current status of the component. This is used for components that + // are no longer active. + State *ComponentState + // The operating system (OS) version supported by the component. If the OS // information is available, a prefix match is performed against the parent image // OS version during image recipe creation. @@ -187,6 +192,19 @@ type ComponentParameterDetail struct { noSmithyDocumentSerde } +// A group of fields that describe the current status of components that are no +// longer active. +type ComponentState struct { + + // Describes how or why the component changed state. + Reason *string + + // The current state of the component. + Status ComponentStatus + + noSmithyDocumentSerde +} + // A high-level summary of a component. type ComponentSummary struct { @@ -211,6 +229,9 @@ type ComponentSummary struct { // The platform of the component. Platform Platform + // Describes the current status of the component. + State *ComponentState + // The operating system (OS) version supported by the component. If the OS // information is available, a prefix match is performed against the parent image // OS version during image recipe creation. @@ -276,16 +297,14 @@ type ComponentVersion struct { // You can assign values for the first three, and can filter on all of them. // Assignment: For the first three nodes you can assign any positive integer value, // including zero, with an upper limit of 2^30-1, or 1073741823 for each node. - // Image Builder automatically assigns the build number, and that is not open for - // updates. Patterns: You can use any numeric pattern that adheres to the - // assignment requirements for the nodes that you can assign. For example, you - // might choose a software version pattern, such as 1.0.0, or a date, such as - // 2021.01.01. Filtering: When you retrieve or reference a resource with a semantic - // version, you can use wildcards (x) to filter your results. When you use a - // wildcard in any node, all nodes to the right of the first wildcard must also be - // wildcards. For example, specifying "1.2.x", or "1.x.x" works to filter list - // results, but neither "1.x.2", nor "x.2.x" will work. You do not have to specify - // the build - Image Builder automatically uses a wildcard for that, if applicable. + // Image Builder automatically assigns the build number to the fourth node. + // Patterns: You can use any numeric pattern that adheres to the assignment + // requirements for the nodes that you can assign. For example, you might choose a + // software version pattern, such as 1.0.0, or a date, such as 2021.01.01. + // Filtering: With semantic versioning, you have the flexibility to use wildcards + // (x) to specify the most recent versions or nodes when selecting the source image + // or components for your recipe. When you use a wildcard in any node, all nodes to + // the right of the first wildcard must also be wildcards. Version *string noSmithyDocumentSerde @@ -391,16 +410,14 @@ type ContainerRecipe struct { // nodes: ../. You can assign values for the first three, and can filter on all of // them. Assignment: For the first three nodes you can assign any positive integer // value, including zero, with an upper limit of 2^30-1, or 1073741823 for each - // node. Image Builder automatically assigns the build number, and that is not open - // for updates. Patterns: You can use any numeric pattern that adheres to the - // assignment requirements for the nodes that you can assign. For example, you - // might choose a software version pattern, such as 1.0.0, or a date, such as - // 2021.01.01. Filtering: When you retrieve or reference a resource with a semantic - // version, you can use wildcards (x) to filter your results. When you use a - // wildcard in any node, all nodes to the right of the first wildcard must also be - // wildcards. For example, specifying "1.2.x", or "1.x.x" works to filter list - // results, but neither "1.x.2", nor "x.2.x" will work. You do not have to specify - // the build - Image Builder automatically uses a wildcard for that, if applicable. + // node. Image Builder automatically assigns the build number to the fourth node. + // Patterns: You can use any numeric pattern that adheres to the assignment + // requirements for the nodes that you can assign. For example, you might choose a + // software version pattern, such as 1.0.0, or a date, such as 2021.01.01. + // Filtering: With semantic versioning, you have the flexibility to use wildcards + // (x) to specify the most recent versions or nodes when selecting the source image + // or components for your recipe. When you use a wildcard in any node, all nodes to + // the right of the first wildcard must also be wildcards. Version *string // The working directory for use during build and test workflows. @@ -543,6 +560,9 @@ type EbsInstanceBlockDeviceSpecification struct { // The snapshot that defines the device contents. SnapshotId *string + // For GP3 volumes only – The throughput in MiB/s that the volume supports. + Throughput *int32 + // Use to override the device's volume size. VolumeSize *int32 @@ -641,16 +661,14 @@ type Image struct { // can assign values for the first three, and can filter on all of them. // Assignment: For the first three nodes you can assign any positive integer value, // including zero, with an upper limit of 2^30-1, or 1073741823 for each node. - // Image Builder automatically assigns the build number, and that is not open for - // updates. Patterns: You can use any numeric pattern that adheres to the - // assignment requirements for the nodes that you can assign. For example, you - // might choose a software version pattern, such as 1.0.0, or a date, such as - // 2021.01.01. Filtering: When you retrieve or reference a resource with a semantic - // version, you can use wildcards (x) to filter your results. When you use a - // wildcard in any node, all nodes to the right of the first wildcard must also be - // wildcards. For example, specifying "1.2.x", or "1.x.x" works to filter list - // results, but neither "1.x.2", nor "x.2.x" will work. You do not have to specify - // the build - Image Builder automatically uses a wildcard for that, if applicable. + // Image Builder automatically assigns the build number to the fourth node. + // Patterns: You can use any numeric pattern that adheres to the assignment + // requirements for the nodes that you can assign. For example, you might choose a + // software version pattern, such as 1.0.0, or a date, such as 2021.01.01. + // Filtering: With semantic versioning, you have the flexibility to use wildcards + // (x) to specify the most recent versions or nodes when selecting the source image + // or components for your recipe. When you use a wildcard in any node, all nodes to + // the right of the first wildcard must also be wildcards. Version *string noSmithyDocumentSerde @@ -916,16 +934,14 @@ type ImageVersion struct { // assign values for the first three, and can filter on all of them. Assignment: // For the first three nodes you can assign any positive integer value, including // zero, with an upper limit of 2^30-1, or 1073741823 for each node. Image Builder - // automatically assigns the build number, and that is not open for updates. - // Patterns: You can use any numeric pattern that adheres to the assignment - // requirements for the nodes that you can assign. For example, you might choose a - // software version pattern, such as 1.0.0, or a date, such as 2021.01.01. - // Filtering: When you retrieve or reference a resource with a semantic version, - // you can use wildcards (x) to filter your results. When you use a wildcard in any - // node, all nodes to the right of the first wildcard must also be wildcards. For - // example, specifying "1.2.x", or "1.x.x" works to filter list results, but - // neither "1.x.2", nor "x.2.x" will work. You do not have to specify the build - - // Image Builder automatically uses a wildcard for that, if applicable. + // automatically assigns the build number to the fourth node. Patterns: You can use + // any numeric pattern that adheres to the assignment requirements for the nodes + // that you can assign. For example, you might choose a software version pattern, + // such as 1.0.0, or a date, such as 2021.01.01. Filtering: With semantic + // versioning, you have the flexibility to use wildcards (x) to specify the most + // recent versions or nodes when selecting the source image or components for your + // recipe. When you use a wildcard in any node, all nodes to the right of the first + // wildcard must also be wildcards. Version *string noSmithyDocumentSerde @@ -946,6 +962,9 @@ type InfrastructureConfiguration struct { // The description of the infrastructure configuration. Description *string + // The instance metadata option settings for the infrastructure configuration. + InstanceMetadataOptions *InstanceMetadataOptions + // The instance profile of the infrastructure configuration. InstanceProfileName *string @@ -1050,6 +1069,38 @@ type InstanceConfiguration struct { noSmithyDocumentSerde } +// The instance metadata options that apply to the HTTP requests that pipeline +// builds use to launch EC2 build and test instances. For more information about +// instance metadata options, see Configure the instance metadata options +// (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-options.html) +// in the Amazon EC2 User Guide for Linux instances, or Configure the instance +// metadata options +// (https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/configuring-instance-metadata-options.html) +// in the Amazon EC2 Windows Guide for Windows instances. +type InstanceMetadataOptions struct { + + // Limit the number of hops that an instance metadata request can traverse to reach + // its destination. + HttpPutResponseHopLimit *int32 + + // Indicates whether a signed token header is required for instance metadata + // retrieval requests. The values affect the response as follows: + // + // * required – + // When you retrieve the IAM role credentials, version 2.0 credentials are returned + // in all cases. + // + // * optional – You can include a signed token header in your + // request to retrieve instance metadata, or you can leave it out. If you include + // it, version 2.0 credentials are returned for the IAM role. Otherwise, version + // 1.0 credentials are returned. + // + // The default setting is optional. + HttpTokens *string + + noSmithyDocumentSerde +} + // Describes the configuration for a launch permission. The launch permission // modification request is sent to the Amazon EC2 ModifyImageAttribute // (https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ModifyImageAttribute.html) @@ -1153,13 +1204,13 @@ type Schedule struct { noSmithyDocumentSerde } -// Contains settings for the SSM agent on your build instance. +// Contains settings for the Systems Manager agent on your build instance. type SystemsManagerAgent struct { - // Controls whether the SSM agent is removed from your final build image, prior to - // creating the new AMI. If this is set to true, then the agent is removed from the - // final image. If it's set to false, then the agent is left in, so that it is - // included in the new AMI. The default value is false. + // Controls whether the Systems Manager agent is removed from your final build + // image, prior to creating the new AMI. If this is set to true, then the agent is + // removed from the final image. If it's set to false, then the agent is left in, + // so that it is included in the new AMI. The default value is false. UninstallAfterBuild *bool noSmithyDocumentSerde diff --git a/service/iot/api_op_CreateAuditSuppression.go b/service/iot/api_op_CreateAuditSuppression.go index e56f625fa8d..348ef3c3753 100644 --- a/service/iot/api_op_CreateAuditSuppression.go +++ b/service/iot/api_op_CreateAuditSuppression.go @@ -42,7 +42,10 @@ type CreateAuditSuppressionInput struct { // This member is required. CheckName *string - // The epoch timestamp in seconds at which this suppression expires. + // Each audit supression must have a unique client request token. If you try to + // create a new audit suppression with the same token as one that already exists, + // an exception occurs. If you omit this value, Amazon Web Services SDKs will + // automatically generate a unique client request. // // This member is required. ClientRequestToken *string diff --git a/service/iot/api_op_ListActiveViolations.go b/service/iot/api_op_ListActiveViolations.go index 9a68718f3d2..404641db345 100644 --- a/service/iot/api_op_ListActiveViolations.go +++ b/service/iot/api_op_ListActiveViolations.go @@ -52,6 +52,9 @@ type ListActiveViolationsInput struct { // The name of the thing whose active violations are listed. ThingName *string + // The verification state of the violation (detect alarm). + VerificationState types.VerificationState + noSmithyDocumentSerde } diff --git a/service/iot/api_op_ListViolationEvents.go b/service/iot/api_op_ListViolationEvents.go index 777eca09089..b10df8c3de3 100644 --- a/service/iot/api_op_ListViolationEvents.go +++ b/service/iot/api_op_ListViolationEvents.go @@ -65,6 +65,9 @@ type ListViolationEventsInput struct { // A filter to limit results to those alerts caused by the specified thing. ThingName *string + // The verification state of the violation (detect alarm). + VerificationState types.VerificationState + noSmithyDocumentSerde } diff --git a/service/iot/api_op_PutVerificationStateOnViolation.go b/service/iot/api_op_PutVerificationStateOnViolation.go new file mode 100644 index 00000000000..afb01e3e216 --- /dev/null +++ b/service/iot/api_op_PutVerificationStateOnViolation.go @@ -0,0 +1,126 @@ +// Code generated by smithy-go-codegen DO NOT EDIT. + +package iot + +import ( + "context" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/aws/signer/v4" + "github.com/aws/aws-sdk-go-v2/service/iot/types" + "github.com/aws/smithy-go/middleware" + smithyhttp "github.com/aws/smithy-go/transport/http" +) + +// Set a verification state and provide a description of that verification state on +// a violation (detect alarm). +func (c *Client) PutVerificationStateOnViolation(ctx context.Context, params *PutVerificationStateOnViolationInput, optFns ...func(*Options)) (*PutVerificationStateOnViolationOutput, error) { + if params == nil { + params = &PutVerificationStateOnViolationInput{} + } + + result, metadata, err := c.invokeOperation(ctx, "PutVerificationStateOnViolation", params, optFns, c.addOperationPutVerificationStateOnViolationMiddlewares) + if err != nil { + return nil, err + } + + out := result.(*PutVerificationStateOnViolationOutput) + out.ResultMetadata = metadata + return out, nil +} + +type PutVerificationStateOnViolationInput struct { + + // The verification state of the violation. + // + // This member is required. + VerificationState types.VerificationState + + // The violation ID. + // + // This member is required. + ViolationId *string + + // The description of the verification state of the violation (detect alarm). + VerificationStateDescription *string + + noSmithyDocumentSerde +} + +type PutVerificationStateOnViolationOutput struct { + // Metadata pertaining to the operation's result. + ResultMetadata middleware.Metadata + + noSmithyDocumentSerde +} + +func (c *Client) addOperationPutVerificationStateOnViolationMiddlewares(stack *middleware.Stack, options Options) (err error) { + err = stack.Serialize.Add(&awsRestjson1_serializeOpPutVerificationStateOnViolation{}, middleware.After) + if err != nil { + return err + } + err = stack.Deserialize.Add(&awsRestjson1_deserializeOpPutVerificationStateOnViolation{}, middleware.After) + if err != nil { + return err + } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddComputeContentLengthMiddleware(stack); err != nil { + return err + } + if err = addResolveEndpointMiddleware(stack, options); err != nil { + return err + } + if err = v4.AddComputePayloadSHA256Middleware(stack); err != nil { + return err + } + if err = addRetryMiddlewares(stack, options); err != nil { + return err + } + if err = addHTTPSignerV4Middleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddRawResponseToMetadata(stack); err != nil { + return err + } + if err = awsmiddleware.AddRecordResponseTiming(stack); err != nil { + return err + } + if err = addClientUserAgent(stack); err != nil { + return err + } + if err = smithyhttp.AddErrorCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = addOpPutVerificationStateOnViolationValidationMiddleware(stack); err != nil { + return err + } + if err = stack.Initialize.Add(newServiceMetadataMiddleware_opPutVerificationStateOnViolation(options.Region), middleware.Before); err != nil { + return err + } + if err = addRequestIDRetrieverMiddleware(stack); err != nil { + return err + } + if err = addResponseErrorMiddleware(stack); err != nil { + return err + } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } + return nil +} + +func newServiceMetadataMiddleware_opPutVerificationStateOnViolation(region string) *awsmiddleware.RegisterServiceMetadata { + return &awsmiddleware.RegisterServiceMetadata{ + Region: region, + ServiceID: ServiceID, + SigningName: "execute-api", + OperationName: "PutVerificationStateOnViolation", + } +} diff --git a/service/iot/deserializers.go b/service/iot/deserializers.go index b06e3c27913..ce302dae6d8 100644 --- a/service/iot/deserializers.go +++ b/service/iot/deserializers.go @@ -28658,6 +28658,95 @@ func awsRestjson1_deserializeOpDocumentListViolationEventsOutput(v **ListViolati return nil } +type awsRestjson1_deserializeOpPutVerificationStateOnViolation struct { +} + +func (*awsRestjson1_deserializeOpPutVerificationStateOnViolation) ID() string { + return "OperationDeserializer" +} + +func (m *awsRestjson1_deserializeOpPutVerificationStateOnViolation) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) ( + out middleware.DeserializeOutput, metadata middleware.Metadata, err error, +) { + out, metadata, err = next.HandleDeserialize(ctx, in) + if err != nil { + return out, metadata, err + } + + response, ok := out.RawResponse.(*smithyhttp.Response) + if !ok { + return out, metadata, &smithy.DeserializationError{Err: fmt.Errorf("unknown transport type %T", out.RawResponse)} + } + + if response.StatusCode < 200 || response.StatusCode >= 300 { + return out, metadata, awsRestjson1_deserializeOpErrorPutVerificationStateOnViolation(response, &metadata) + } + output := &PutVerificationStateOnViolationOutput{} + out.Result = output + + return out, metadata, err +} + +func awsRestjson1_deserializeOpErrorPutVerificationStateOnViolation(response *smithyhttp.Response, metadata *middleware.Metadata) error { + var errorBuffer bytes.Buffer + if _, err := io.Copy(&errorBuffer, response.Body); err != nil { + return &smithy.DeserializationError{Err: fmt.Errorf("failed to copy error response body, %w", err)} + } + errorBody := bytes.NewReader(errorBuffer.Bytes()) + + errorCode := "UnknownError" + errorMessage := errorCode + + code := response.Header.Get("X-Amzn-ErrorType") + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(errorBody, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + code, message, err := restjson.GetErrorInfo(decoder) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return err + } + + errorBody.Seek(0, io.SeekStart) + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + if len(message) != 0 { + errorMessage = message + } + + switch { + case strings.EqualFold("InternalFailureException", errorCode): + return awsRestjson1_deserializeErrorInternalFailureException(response, errorBody) + + case strings.EqualFold("InvalidRequestException", errorCode): + return awsRestjson1_deserializeErrorInvalidRequestException(response, errorBody) + + case strings.EqualFold("ThrottlingException", errorCode): + return awsRestjson1_deserializeErrorThrottlingException(response, errorBody) + + default: + genericError := &smithy.GenericAPIError{ + Code: errorCode, + Message: errorMessage, + } + return genericError + + } +} + type awsRestjson1_deserializeOpRegisterCACertificate struct { } @@ -37068,6 +37157,24 @@ func awsRestjson1_deserializeDocumentActiveViolation(v **types.ActiveViolation, sv.ThingName = ptr.String(jtv) } + case "verificationState": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected VerificationState to be of type string, got %T instead", value) + } + sv.VerificationState = types.VerificationState(jtv) + } + + case "verificationStateDescription": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected VerificationStateDescription to be of type string, got %T instead", value) + } + sv.VerificationStateDescription = ptr.String(jtv) + } + case "violationEventAdditionalInfo": if err := awsRestjson1_deserializeDocumentViolationEventAdditionalInfo(&sv.ViolationEventAdditionalInfo, value); err != nil { return err @@ -53468,6 +53575,24 @@ func awsRestjson1_deserializeDocumentViolationEvent(v **types.ViolationEvent, va sv.ThingName = ptr.String(jtv) } + case "verificationState": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected VerificationState to be of type string, got %T instead", value) + } + sv.VerificationState = types.VerificationState(jtv) + } + + case "verificationStateDescription": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected VerificationStateDescription to be of type string, got %T instead", value) + } + sv.VerificationStateDescription = ptr.String(jtv) + } + case "violationEventAdditionalInfo": if err := awsRestjson1_deserializeDocumentViolationEventAdditionalInfo(&sv.ViolationEventAdditionalInfo, value); err != nil { return err diff --git a/service/iot/generated.json b/service/iot/generated.json index 930e7ff3d2b..2cc0e9f12d8 100644 --- a/service/iot/generated.json +++ b/service/iot/generated.json @@ -189,6 +189,7 @@ "api_op_ListTopicRules.go", "api_op_ListV2LoggingLevels.go", "api_op_ListViolationEvents.go", + "api_op_PutVerificationStateOnViolation.go", "api_op_RegisterCACertificate.go", "api_op_RegisterCertificate.go", "api_op_RegisterCertificateWithoutCA.go", diff --git a/service/iot/serializers.go b/service/iot/serializers.go index e3964487cfa..e8a26624429 100644 --- a/service/iot/serializers.go +++ b/service/iot/serializers.go @@ -9182,6 +9182,10 @@ func awsRestjson1_serializeOpHttpBindingsListActiveViolationsInput(v *ListActive encoder.SetQuery("thingName").String(*v.ThingName) } + if len(v.VerificationState) > 0 { + encoder.SetQuery("verificationState").String(string(v.VerificationState)) + } + return nil } @@ -12676,6 +12680,96 @@ func awsRestjson1_serializeOpHttpBindingsListViolationEventsInput(v *ListViolati encoder.SetQuery("thingName").String(*v.ThingName) } + if len(v.VerificationState) > 0 { + encoder.SetQuery("verificationState").String(string(v.VerificationState)) + } + + return nil +} + +type awsRestjson1_serializeOpPutVerificationStateOnViolation struct { +} + +func (*awsRestjson1_serializeOpPutVerificationStateOnViolation) ID() string { + return "OperationSerializer" +} + +func (m *awsRestjson1_serializeOpPutVerificationStateOnViolation) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) ( + out middleware.SerializeOutput, metadata middleware.Metadata, err error, +) { + request, ok := in.Request.(*smithyhttp.Request) + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown transport type %T", in.Request)} + } + + input, ok := in.Parameters.(*PutVerificationStateOnViolationInput) + _ = input + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown input parameters type %T", in.Parameters)} + } + + opPath, opQuery := httpbinding.SplitURI("/violations/verification-state/{violationId}") + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) + request.Method = "POST" + restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if err := awsRestjson1_serializeOpHttpBindingsPutVerificationStateOnViolationInput(input, restEncoder); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + restEncoder.SetHeader("Content-Type").String("application/json") + + jsonEncoder := smithyjson.NewEncoder() + if err := awsRestjson1_serializeOpDocumentPutVerificationStateOnViolationInput(input, jsonEncoder.Value); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request, err = request.SetStream(bytes.NewReader(jsonEncoder.Bytes())); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request.Request, err = restEncoder.Encode(request.Request); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + in.Request = request + + return next.HandleSerialize(ctx, in) +} +func awsRestjson1_serializeOpHttpBindingsPutVerificationStateOnViolationInput(v *PutVerificationStateOnViolationInput, encoder *httpbinding.Encoder) error { + if v == nil { + return fmt.Errorf("unsupported serialization of nil %T", v) + } + + if v.ViolationId == nil || len(*v.ViolationId) == 0 { + return &smithy.SerializationError{Err: fmt.Errorf("input member violationId must not be empty")} + } + if v.ViolationId != nil { + if err := encoder.SetURI("violationId").String(*v.ViolationId); err != nil { + return err + } + } + + return nil +} + +func awsRestjson1_serializeOpDocumentPutVerificationStateOnViolationInput(v *PutVerificationStateOnViolationInput, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if len(v.VerificationState) > 0 { + ok := object.Key("verificationState") + ok.String(string(v.VerificationState)) + } + + if v.VerificationStateDescription != nil { + ok := object.Key("verificationStateDescription") + ok.String(*v.VerificationStateDescription) + } + return nil } diff --git a/service/iot/types/enums.go b/service/iot/types/enums.go index e6ba4925669..4be63ff7e0d 100644 --- a/service/iot/types/enums.go +++ b/service/iot/types/enums.go @@ -1342,6 +1342,28 @@ func (TopicRuleDestinationStatus) Values() []TopicRuleDestinationStatus { } } +type VerificationState string + +// Enum values for VerificationState +const ( + VerificationStateFalsePositive VerificationState = "FALSE_POSITIVE" + VerificationStateBenignPositive VerificationState = "BENIGN_POSITIVE" + VerificationStateTruePositive VerificationState = "TRUE_POSITIVE" + VerificationStateUnknown VerificationState = "UNKNOWN" +) + +// Values returns all known values for VerificationState. 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 (VerificationState) Values() []VerificationState { + return []VerificationState{ + "FALSE_POSITIVE", + "BENIGN_POSITIVE", + "TRUE_POSITIVE", + "UNKNOWN", + } +} + type ViolationEventType string // Enum values for ViolationEventType diff --git a/service/iot/types/types.go b/service/iot/types/types.go index 8546136389c..9e1a97d1321 100644 --- a/service/iot/types/types.go +++ b/service/iot/types/types.go @@ -67,10 +67,11 @@ type Action struct { // DynamoDB column. DynamoDBv2 *DynamoDBv2Action - // Write data to an Amazon Elasticsearch Service domain. This action is deprecated. - // Use the OpenSearch action - // (https://docs.aws.amazon.com/iot/latest/apireference/API_OpenSearchAction.html) - // instead. + // Write data to an Amazon OpenSearch Service domain. The Elasticsearch action can + // only be used by existing rule actions. To create a new rule action or to update + // an existing rule action, use the OpenSearch rule action instead. For more + // information, see OpenSearchAction + // (https://docs.aws.amazon.com/iot/latest/apireference/API_OpenSearchAction.html). Elasticsearch *ElasticsearchAction // Write to an Amazon Kinesis Firehose stream. @@ -147,6 +148,12 @@ type ActiveViolation struct { // The name of the thing responsible for the active violation. ThingName *string + // The verification state of the violation (detect alarm). + VerificationState VerificationState + + // The description of the verification state of the violation. + VerificationStateDescription *string + // The details of a violation event. ViolationEventAdditionalInfo *ViolationEventAdditionalInfo @@ -1415,13 +1422,14 @@ type EffectivePolicy struct { noSmithyDocumentSerde } -// Describes an action that writes data to an Amazon Elasticsearch Service domain. -// This action is deprecated. Use the OpenSearch action -// (https://docs.aws.amazon.com/iot/latest/apireference/API_OpenSearchAction.html) -// instead. +// Describes an action that writes data to an Amazon OpenSearch Service domain. The +// Elasticsearch action can only be used by existing rule actions. To create a new +// rule action or to update an existing rule action, use the OpenSearch rule action +// instead. For more information, see OpenSearchAction +// (https://docs.aws.amazon.com/iot/latest/apireference/API_OpenSearchAction.html). type ElasticsearchAction struct { - // The endpoint of your Elasticsearch domain. + // The endpoint of your OpenSearch domain. // // This member is required. Endpoint *string @@ -1431,12 +1439,12 @@ type ElasticsearchAction struct { // This member is required. Id *string - // The Elasticsearch index where you want to store your data. + // The index where you want to store your data. // // This member is required. Index *string - // The IAM role ARN that has access to Elasticsearch. + // The IAM role ARN that has access to OpenSearch. // // This member is required. RoleArn *string @@ -3845,6 +3853,12 @@ type ViolationEvent struct { // The name of the thing responsible for the violation event. ThingName *string + // The verification state of the violation (detect alarm). + VerificationState VerificationState + + // The description of the verification state of the violation. + VerificationStateDescription *string + // The details of a violation event. ViolationEventAdditionalInfo *ViolationEventAdditionalInfo diff --git a/service/iot/validators.go b/service/iot/validators.go index 0d03ba29fea..97c8f924763 100644 --- a/service/iot/validators.go +++ b/service/iot/validators.go @@ -2750,6 +2750,26 @@ func (m *validateOpListViolationEvents) HandleInitialize(ctx context.Context, in return next.HandleInitialize(ctx, in) } +type validateOpPutVerificationStateOnViolation struct { +} + +func (*validateOpPutVerificationStateOnViolation) ID() string { + return "OperationInputValidation" +} + +func (m *validateOpPutVerificationStateOnViolation) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) ( + out middleware.InitializeOutput, metadata middleware.Metadata, err error, +) { + input, ok := in.Parameters.(*PutVerificationStateOnViolationInput) + if !ok { + return out, metadata, fmt.Errorf("unknown input parameters type %T", in.Parameters) + } + if err := validateOpPutVerificationStateOnViolationInput(input); err != nil { + return out, metadata, err + } + return next.HandleInitialize(ctx, in) +} + type validateOpRegisterCACertificate struct { } @@ -4158,6 +4178,10 @@ func addOpListViolationEventsValidationMiddleware(stack *middleware.Stack) error return stack.Initialize.Add(&validateOpListViolationEvents{}, middleware.After) } +func addOpPutVerificationStateOnViolationValidationMiddleware(stack *middleware.Stack) error { + return stack.Initialize.Add(&validateOpPutVerificationStateOnViolation{}, middleware.After) +} + func addOpRegisterCACertificateValidationMiddleware(stack *middleware.Stack) error { return stack.Initialize.Add(&validateOpRegisterCACertificate{}, middleware.After) } @@ -8282,6 +8306,24 @@ func validateOpListViolationEventsInput(v *ListViolationEventsInput) error { } } +func validateOpPutVerificationStateOnViolationInput(v *PutVerificationStateOnViolationInput) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "PutVerificationStateOnViolationInput"} + if v.ViolationId == nil { + invalidParams.Add(smithy.NewErrParamRequired("ViolationId")) + } + if len(v.VerificationState) == 0 { + invalidParams.Add(smithy.NewErrParamRequired("VerificationState")) + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + func validateOpRegisterCACertificateInput(v *RegisterCACertificateInput) error { if v == nil { return nil diff --git a/service/iotevents/internal/endpoints/endpoints.go b/service/iotevents/internal/endpoints/endpoints.go index e88731d6714..11ce33e1b6a 100644 --- a/service/iotevents/internal/endpoints/endpoints.go +++ b/service/iotevents/internal/endpoints/endpoints.go @@ -117,5 +117,8 @@ var defaultPartitions = endpoints.Partitions{ }, RegionRegex: partitionRegexp.AwsUsGov, IsRegionalized: true, + Endpoints: endpoints.Endpoints{ + "us-gov-west-1": endpoints.Endpoint{}, + }, }, } diff --git a/service/kafkaconnect/internal/endpoints/endpoints.go b/service/kafkaconnect/internal/endpoints/endpoints.go index 3fff27576f1..1547dd14885 100644 --- a/service/kafkaconnect/internal/endpoints/endpoints.go +++ b/service/kafkaconnect/internal/endpoints/endpoints.go @@ -62,6 +62,24 @@ var defaultPartitions = endpoints.Partitions{ }, RegionRegex: partitionRegexp.Aws, IsRegionalized: true, + Endpoints: endpoints.Endpoints{ + "ap-northeast-1": endpoints.Endpoint{}, + "ap-northeast-2": endpoints.Endpoint{}, + "ap-south-1": endpoints.Endpoint{}, + "ap-southeast-1": endpoints.Endpoint{}, + "ap-southeast-2": endpoints.Endpoint{}, + "ca-central-1": endpoints.Endpoint{}, + "eu-central-1": endpoints.Endpoint{}, + "eu-north-1": endpoints.Endpoint{}, + "eu-west-1": endpoints.Endpoint{}, + "eu-west-2": endpoints.Endpoint{}, + "eu-west-3": endpoints.Endpoint{}, + "sa-east-1": endpoints.Endpoint{}, + "us-east-1": endpoints.Endpoint{}, + "us-east-2": endpoints.Endpoint{}, + "us-west-1": endpoints.Endpoint{}, + "us-west-2": endpoints.Endpoint{}, + }, }, { ID: "aws-cn", diff --git a/service/lakeformation/internal/endpoints/endpoints.go b/service/lakeformation/internal/endpoints/endpoints.go index 0908cbb0cbd..024e58dcd81 100644 --- a/service/lakeformation/internal/endpoints/endpoints.go +++ b/service/lakeformation/internal/endpoints/endpoints.go @@ -67,6 +67,7 @@ var defaultPartitions = endpoints.Partitions{ "ap-east-1": endpoints.Endpoint{}, "ap-northeast-1": endpoints.Endpoint{}, "ap-northeast-2": endpoints.Endpoint{}, + "ap-northeast-3": endpoints.Endpoint{}, "ap-south-1": endpoints.Endpoint{}, "ap-southeast-1": endpoints.Endpoint{}, "ap-southeast-2": endpoints.Endpoint{}, diff --git a/service/lexmodelsv2/api_op_DeleteUtterances.go b/service/lexmodelsv2/api_op_DeleteUtterances.go new file mode 100644 index 00000000000..0a75c6d14bc --- /dev/null +++ b/service/lexmodelsv2/api_op_DeleteUtterances.go @@ -0,0 +1,133 @@ +// Code generated by smithy-go-codegen DO NOT EDIT. + +package lexmodelsv2 + +import ( + "context" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/aws/signer/v4" + "github.com/aws/smithy-go/middleware" + smithyhttp "github.com/aws/smithy-go/transport/http" +) + +// Deletes stored utterances. Amazon Lex stores the utterances that users send to +// your bot. Utterances are stored for 15 days for use with the operation, and then +// stored indefinitely for use in improving the ability of your bot to respond to +// user input.. Use the DeleteUtterances operation to manually delete utterances +// for a specific session. When you use the DeleteUtterances operation, utterances +// stored for improving your bot's ability to respond to user input are deleted +// immediately. Utterances stored for use with the ListAggregatedUtterances +// operation are deleted after 15 days. +func (c *Client) DeleteUtterances(ctx context.Context, params *DeleteUtterancesInput, optFns ...func(*Options)) (*DeleteUtterancesOutput, error) { + if params == nil { + params = &DeleteUtterancesInput{} + } + + result, metadata, err := c.invokeOperation(ctx, "DeleteUtterances", params, optFns, c.addOperationDeleteUtterancesMiddlewares) + if err != nil { + return nil, err + } + + out := result.(*DeleteUtterancesOutput) + out.ResultMetadata = metadata + return out, nil +} + +type DeleteUtterancesInput struct { + + // The unique identifier of the bot that contains the utterances. + // + // This member is required. + BotId *string + + // The identifier of the language and locale where the utterances were collected. + // The string must match one of the supported locales. For more information, see + // Supported languages + // (https://docs.aws.amazon.com/lexv2/latest/dg/how-languages.html). + LocaleId *string + + // The unique identifier of the session with the user. The ID is returned in the + // response from the and operations. + SessionId *string + + noSmithyDocumentSerde +} + +type DeleteUtterancesOutput struct { + // Metadata pertaining to the operation's result. + ResultMetadata middleware.Metadata + + noSmithyDocumentSerde +} + +func (c *Client) addOperationDeleteUtterancesMiddlewares(stack *middleware.Stack, options Options) (err error) { + err = stack.Serialize.Add(&awsRestjson1_serializeOpDeleteUtterances{}, middleware.After) + if err != nil { + return err + } + err = stack.Deserialize.Add(&awsRestjson1_deserializeOpDeleteUtterances{}, middleware.After) + if err != nil { + return err + } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddComputeContentLengthMiddleware(stack); err != nil { + return err + } + if err = addResolveEndpointMiddleware(stack, options); err != nil { + return err + } + if err = v4.AddComputePayloadSHA256Middleware(stack); err != nil { + return err + } + if err = addRetryMiddlewares(stack, options); err != nil { + return err + } + if err = addHTTPSignerV4Middleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddRawResponseToMetadata(stack); err != nil { + return err + } + if err = awsmiddleware.AddRecordResponseTiming(stack); err != nil { + return err + } + if err = addClientUserAgent(stack); err != nil { + return err + } + if err = smithyhttp.AddErrorCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = addOpDeleteUtterancesValidationMiddleware(stack); err != nil { + return err + } + if err = stack.Initialize.Add(newServiceMetadataMiddleware_opDeleteUtterances(options.Region), middleware.Before); err != nil { + return err + } + if err = addRequestIDRetrieverMiddleware(stack); err != nil { + return err + } + if err = addResponseErrorMiddleware(stack); err != nil { + return err + } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } + return nil +} + +func newServiceMetadataMiddleware_opDeleteUtterances(region string) *awsmiddleware.RegisterServiceMetadata { + return &awsmiddleware.RegisterServiceMetadata{ + Region: region, + ServiceID: ServiceID, + SigningName: "lex", + OperationName: "DeleteUtterances", + } +} diff --git a/service/lexmodelsv2/api_op_ListAggregatedUtterances.go b/service/lexmodelsv2/api_op_ListAggregatedUtterances.go new file mode 100644 index 00000000000..b84b395a9f6 --- /dev/null +++ b/service/lexmodelsv2/api_op_ListAggregatedUtterances.go @@ -0,0 +1,319 @@ +// Code generated by smithy-go-codegen DO NOT EDIT. + +package lexmodelsv2 + +import ( + "context" + "fmt" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/aws/signer/v4" + "github.com/aws/aws-sdk-go-v2/service/lexmodelsv2/types" + "github.com/aws/smithy-go/middleware" + smithyhttp "github.com/aws/smithy-go/transport/http" + "time" +) + +// Provides a list of utterances that users have sent to the bot. Utterances are +// aggregated by the text of the utterance. For example, all instances where +// customers used the phrase "I want to order pizza" are aggregated into the same +// line in the response. You can see both detected utterances and missed +// utterances. A detected utterance is where the bot properly recognized the +// utterance and activated the associated intent. A missed utterance was not +// recognized by the bot and didn't activate an intent. Utterances can be +// aggregated for a bot alias or for a bot version, but not both at the same time. +// Utterances statistics are not generated under the following conditions: +// +// * The +// childDirected field was set to true when the bot was created. +// +// * You are using +// slot obfuscation with one or more slots. +// +// * You opted out of participating in +// improving Amazon Lex. +func (c *Client) ListAggregatedUtterances(ctx context.Context, params *ListAggregatedUtterancesInput, optFns ...func(*Options)) (*ListAggregatedUtterancesOutput, error) { + if params == nil { + params = &ListAggregatedUtterancesInput{} + } + + result, metadata, err := c.invokeOperation(ctx, "ListAggregatedUtterances", params, optFns, c.addOperationListAggregatedUtterancesMiddlewares) + if err != nil { + return nil, err + } + + out := result.(*ListAggregatedUtterancesOutput) + out.ResultMetadata = metadata + return out, nil +} + +type ListAggregatedUtterancesInput struct { + + // The time window for aggregating the utterance information. You can specify a + // time between one hour and two weeks. + // + // This member is required. + AggregationDuration *types.UtteranceAggregationDuration + + // The unique identifier of the bot associated with this request. + // + // This member is required. + BotId *string + + // The identifier of the language and locale where the utterances were collected. + // For more information, see Supported languages + // (https://docs.aws.amazon.com/lexv2/latest/dg/how-languages.html). + // + // This member is required. + LocaleId *string + + // The identifier of the bot alias associated with this request. If you specify the + // bot alias, you can't specify the bot version. + BotAliasId *string + + // The identifier of the bot version associated with this request. If you specify + // the bot version, you can't specify the bot alias. + BotVersion *string + + // Provides the specification of a filter used to limit the utterances in the + // response to only those that match the filter specification. You can only specify + // one filter and one string to filter on. + Filters []types.AggregatedUtterancesFilter + + // The maximum number of utterances to return in each page of results. If there are + // fewer results than the maximum page size, only the actual number of results are + // returned. If you don't specify the maxResults parameter, 1,000 results are + // returned. + MaxResults *int32 + + // If the response from the ListAggregatedUtterances operation contains more + // results that specified in the maxResults parameter, a token is returned in the + // response. Use that token in the nextToken parameter to return the next page of + // results. + NextToken *string + + // Specifies sorting parameters for the list of utterances. You can sort by the hit + // count, the missed count, or the number of distinct sessions the utterance + // appeared in. + SortBy *types.AggregatedUtterancesSortBy + + noSmithyDocumentSerde +} + +type ListAggregatedUtterancesOutput struct { + + // Summaries of the aggregated utterance data. Each response contains information + // about the number of times that the utterance was seen during the time period, + // whether it was detected or missed, and when it was seen during the time period. + AggregatedUtterancesSummaries []types.AggregatedUtterancesSummary + + // The time period used to aggregate the utterance data. + AggregationDuration *types.UtteranceAggregationDuration + + // The last date and time that the aggregated data was collected. The time period + // depends on the length of the aggregation window. + // + // * Hours - for 1 hour time + // window, every half hour; otherwise every hour. + // + // * Days - every 6 hours + // + // * Weeks + // - for a one week time window, every 12 hours; otherwise, every day + AggregationLastRefreshedDateTime *time.Time + + // The date and time that the aggregation window ends. Only data collected between + // the start time and the end time are returned in the results. + AggregationWindowEndTime *time.Time + + // The date and time that the aggregation window begins. Only data collected after + // this time is returned in the results. + AggregationWindowStartTime *time.Time + + // The identifier of the bot alias that contains the utterances. If you specified + // the bot version, the bot alias ID isn't returned. + BotAliasId *string + + // The identifier of the bot that contains the utterances. + BotId *string + + // The identifier of the bot version that contains the utterances. If you specified + // the bot alias, the bot version isn't returned. + BotVersion *string + + // The identifier of the language and locale that the utterances are in. + LocaleId *string + + // A token that indicates whether there are more results to return in a response to + // the ListAggregatedUtterances operation. If the nextToken field is present, you + // send the contents as the nextToken parameter of a ListAggregatedUtterances + // operation request to get the next page of results. + NextToken *string + + // Metadata pertaining to the operation's result. + ResultMetadata middleware.Metadata + + noSmithyDocumentSerde +} + +func (c *Client) addOperationListAggregatedUtterancesMiddlewares(stack *middleware.Stack, options Options) (err error) { + err = stack.Serialize.Add(&awsRestjson1_serializeOpListAggregatedUtterances{}, middleware.After) + if err != nil { + return err + } + err = stack.Deserialize.Add(&awsRestjson1_deserializeOpListAggregatedUtterances{}, middleware.After) + if err != nil { + return err + } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddComputeContentLengthMiddleware(stack); err != nil { + return err + } + if err = addResolveEndpointMiddleware(stack, options); err != nil { + return err + } + if err = v4.AddComputePayloadSHA256Middleware(stack); err != nil { + return err + } + if err = addRetryMiddlewares(stack, options); err != nil { + return err + } + if err = addHTTPSignerV4Middleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddRawResponseToMetadata(stack); err != nil { + return err + } + if err = awsmiddleware.AddRecordResponseTiming(stack); err != nil { + return err + } + if err = addClientUserAgent(stack); err != nil { + return err + } + if err = smithyhttp.AddErrorCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = addOpListAggregatedUtterancesValidationMiddleware(stack); err != nil { + return err + } + if err = stack.Initialize.Add(newServiceMetadataMiddleware_opListAggregatedUtterances(options.Region), middleware.Before); err != nil { + return err + } + if err = addRequestIDRetrieverMiddleware(stack); err != nil { + return err + } + if err = addResponseErrorMiddleware(stack); err != nil { + return err + } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } + return nil +} + +// ListAggregatedUtterancesAPIClient is a client that implements the +// ListAggregatedUtterances operation. +type ListAggregatedUtterancesAPIClient interface { + ListAggregatedUtterances(context.Context, *ListAggregatedUtterancesInput, ...func(*Options)) (*ListAggregatedUtterancesOutput, error) +} + +var _ ListAggregatedUtterancesAPIClient = (*Client)(nil) + +// ListAggregatedUtterancesPaginatorOptions is the paginator options for +// ListAggregatedUtterances +type ListAggregatedUtterancesPaginatorOptions struct { + // The maximum number of utterances to return in each page of results. If there are + // fewer results than the maximum page size, only the actual number of results are + // returned. If you don't specify the maxResults parameter, 1,000 results are + // returned. + Limit int32 + + // Set to true if pagination should stop if the service returns a pagination token + // that matches the most recent token provided to the service. + StopOnDuplicateToken bool +} + +// ListAggregatedUtterancesPaginator is a paginator for ListAggregatedUtterances +type ListAggregatedUtterancesPaginator struct { + options ListAggregatedUtterancesPaginatorOptions + client ListAggregatedUtterancesAPIClient + params *ListAggregatedUtterancesInput + nextToken *string + firstPage bool +} + +// NewListAggregatedUtterancesPaginator returns a new +// ListAggregatedUtterancesPaginator +func NewListAggregatedUtterancesPaginator(client ListAggregatedUtterancesAPIClient, params *ListAggregatedUtterancesInput, optFns ...func(*ListAggregatedUtterancesPaginatorOptions)) *ListAggregatedUtterancesPaginator { + if params == nil { + params = &ListAggregatedUtterancesInput{} + } + + options := ListAggregatedUtterancesPaginatorOptions{} + if params.MaxResults != nil { + options.Limit = *params.MaxResults + } + + for _, fn := range optFns { + fn(&options) + } + + return &ListAggregatedUtterancesPaginator{ + options: options, + client: client, + params: params, + firstPage: true, + } +} + +// HasMorePages returns a boolean indicating whether more pages are available +func (p *ListAggregatedUtterancesPaginator) HasMorePages() bool { + return p.firstPage || p.nextToken != nil +} + +// NextPage retrieves the next ListAggregatedUtterances page. +func (p *ListAggregatedUtterancesPaginator) NextPage(ctx context.Context, optFns ...func(*Options)) (*ListAggregatedUtterancesOutput, error) { + if !p.HasMorePages() { + return nil, fmt.Errorf("no more pages available") + } + + params := *p.params + params.NextToken = p.nextToken + + var limit *int32 + if p.options.Limit > 0 { + limit = &p.options.Limit + } + params.MaxResults = limit + + result, err := p.client.ListAggregatedUtterances(ctx, ¶ms, optFns...) + if err != nil { + return nil, err + } + p.firstPage = false + + prevToken := p.nextToken + p.nextToken = result.NextToken + + if p.options.StopOnDuplicateToken && prevToken != nil && p.nextToken != nil && *prevToken == *p.nextToken { + p.nextToken = nil + } + + return result, nil +} + +func newServiceMetadataMiddleware_opListAggregatedUtterances(region string) *awsmiddleware.RegisterServiceMetadata { + return &awsmiddleware.RegisterServiceMetadata{ + Region: region, + ServiceID: ServiceID, + SigningName: "lex", + OperationName: "ListAggregatedUtterances", + } +} diff --git a/service/lexmodelsv2/deserializers.go b/service/lexmodelsv2/deserializers.go index 9b34c83f08f..126575b6651 100644 --- a/service/lexmodelsv2/deserializers.go +++ b/service/lexmodelsv2/deserializers.go @@ -4446,6 +4446,95 @@ func awsRestjson1_deserializeOpErrorDeleteSlotType(response *smithyhttp.Response } } +type awsRestjson1_deserializeOpDeleteUtterances struct { +} + +func (*awsRestjson1_deserializeOpDeleteUtterances) ID() string { + return "OperationDeserializer" +} + +func (m *awsRestjson1_deserializeOpDeleteUtterances) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) ( + out middleware.DeserializeOutput, metadata middleware.Metadata, err error, +) { + out, metadata, err = next.HandleDeserialize(ctx, in) + if err != nil { + return out, metadata, err + } + + response, ok := out.RawResponse.(*smithyhttp.Response) + if !ok { + return out, metadata, &smithy.DeserializationError{Err: fmt.Errorf("unknown transport type %T", out.RawResponse)} + } + + if response.StatusCode < 200 || response.StatusCode >= 300 { + return out, metadata, awsRestjson1_deserializeOpErrorDeleteUtterances(response, &metadata) + } + output := &DeleteUtterancesOutput{} + out.Result = output + + return out, metadata, err +} + +func awsRestjson1_deserializeOpErrorDeleteUtterances(response *smithyhttp.Response, metadata *middleware.Metadata) error { + var errorBuffer bytes.Buffer + if _, err := io.Copy(&errorBuffer, response.Body); err != nil { + return &smithy.DeserializationError{Err: fmt.Errorf("failed to copy error response body, %w", err)} + } + errorBody := bytes.NewReader(errorBuffer.Bytes()) + + errorCode := "UnknownError" + errorMessage := errorCode + + code := response.Header.Get("X-Amzn-ErrorType") + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(errorBody, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + code, message, err := restjson.GetErrorInfo(decoder) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return err + } + + errorBody.Seek(0, io.SeekStart) + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + if len(message) != 0 { + errorMessage = message + } + + switch { + case strings.EqualFold("InternalServerException", errorCode): + return awsRestjson1_deserializeErrorInternalServerException(response, errorBody) + + case strings.EqualFold("ThrottlingException", errorCode): + return awsRestjson1_deserializeErrorThrottlingException(response, errorBody) + + case strings.EqualFold("ValidationException", errorCode): + return awsRestjson1_deserializeErrorValidationException(response, errorBody) + + default: + genericError := &smithy.GenericAPIError{ + Code: errorCode, + Message: errorMessage, + } + return genericError + + } +} + type awsRestjson1_deserializeOpDescribeBot struct { } @@ -6905,7 +6994,255 @@ func awsRestjson1_deserializeOpDocumentDescribeSlotTypeOutput(v **DescribeSlotTy sv.BotVersion = ptr.String(jtv) } - case "creationDateTime": + case "creationDateTime": + if value != nil { + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.CreationDateTime = ptr.Time(smithytime.ParseEpochSeconds(f64)) + + default: + return fmt.Errorf("expected Timestamp to be a JSON Number, got %T instead", value) + + } + } + + case "description": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected Description to be of type string, got %T instead", value) + } + sv.Description = ptr.String(jtv) + } + + case "lastUpdatedDateTime": + if value != nil { + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.LastUpdatedDateTime = ptr.Time(smithytime.ParseEpochSeconds(f64)) + + default: + return fmt.Errorf("expected Timestamp to be a JSON Number, got %T instead", value) + + } + } + + case "localeId": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected LocaleId to be of type string, got %T instead", value) + } + sv.LocaleId = ptr.String(jtv) + } + + case "parentSlotTypeSignature": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected SlotTypeSignature to be of type string, got %T instead", value) + } + sv.ParentSlotTypeSignature = ptr.String(jtv) + } + + case "slotTypeId": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected Id to be of type string, got %T instead", value) + } + sv.SlotTypeId = ptr.String(jtv) + } + + case "slotTypeName": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected Name to be of type string, got %T instead", value) + } + sv.SlotTypeName = ptr.String(jtv) + } + + case "slotTypeValues": + if err := awsRestjson1_deserializeDocumentSlotTypeValues(&sv.SlotTypeValues, value); err != nil { + return err + } + + case "valueSelectionSetting": + if err := awsRestjson1_deserializeDocumentSlotValueSelectionSetting(&sv.ValueSelectionSetting, value); err != nil { + return err + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + +type awsRestjson1_deserializeOpListAggregatedUtterances struct { +} + +func (*awsRestjson1_deserializeOpListAggregatedUtterances) ID() string { + return "OperationDeserializer" +} + +func (m *awsRestjson1_deserializeOpListAggregatedUtterances) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) ( + out middleware.DeserializeOutput, metadata middleware.Metadata, err error, +) { + out, metadata, err = next.HandleDeserialize(ctx, in) + if err != nil { + return out, metadata, err + } + + response, ok := out.RawResponse.(*smithyhttp.Response) + if !ok { + return out, metadata, &smithy.DeserializationError{Err: fmt.Errorf("unknown transport type %T", out.RawResponse)} + } + + if response.StatusCode < 200 || response.StatusCode >= 300 { + return out, metadata, awsRestjson1_deserializeOpErrorListAggregatedUtterances(response, &metadata) + } + output := &ListAggregatedUtterancesOutput{} + out.Result = output + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(response.Body, ringBuffer) + + decoder := json.NewDecoder(body) + decoder.UseNumber() + var shape interface{} + if err := decoder.Decode(&shape); err != nil && err != io.EOF { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + err = awsRestjson1_deserializeOpDocumentListAggregatedUtterancesOutput(&output, shape) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + return out, metadata, &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body with invalid JSON, %w", err), + Snapshot: snapshot.Bytes(), + } + } + + return out, metadata, err +} + +func awsRestjson1_deserializeOpErrorListAggregatedUtterances(response *smithyhttp.Response, metadata *middleware.Metadata) error { + var errorBuffer bytes.Buffer + if _, err := io.Copy(&errorBuffer, response.Body); err != nil { + return &smithy.DeserializationError{Err: fmt.Errorf("failed to copy error response body, %w", err)} + } + errorBody := bytes.NewReader(errorBuffer.Bytes()) + + errorCode := "UnknownError" + errorMessage := errorCode + + code := response.Header.Get("X-Amzn-ErrorType") + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(errorBody, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + code, message, err := restjson.GetErrorInfo(decoder) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return err + } + + errorBody.Seek(0, io.SeekStart) + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + if len(message) != 0 { + errorMessage = message + } + + switch { + case strings.EqualFold("InternalServerException", errorCode): + return awsRestjson1_deserializeErrorInternalServerException(response, errorBody) + + case strings.EqualFold("PreconditionFailedException", errorCode): + return awsRestjson1_deserializeErrorPreconditionFailedException(response, errorBody) + + case strings.EqualFold("ThrottlingException", errorCode): + return awsRestjson1_deserializeErrorThrottlingException(response, errorBody) + + case strings.EqualFold("ValidationException", errorCode): + return awsRestjson1_deserializeErrorValidationException(response, errorBody) + + default: + genericError := &smithy.GenericAPIError{ + Code: errorCode, + Message: errorMessage, + } + return genericError + + } +} + +func awsRestjson1_deserializeOpDocumentListAggregatedUtterancesOutput(v **ListAggregatedUtterancesOutput, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *ListAggregatedUtterancesOutput + if *v == nil { + sv = &ListAggregatedUtterancesOutput{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "aggregatedUtterancesSummaries": + if err := awsRestjson1_deserializeDocumentAggregatedUtterancesSummaryList(&sv.AggregatedUtterancesSummaries, value); err != nil { + return err + } + + case "aggregationDuration": + if err := awsRestjson1_deserializeDocumentUtteranceAggregationDuration(&sv.AggregationDuration, value); err != nil { + return err + } + + case "aggregationLastRefreshedDateTime": if value != nil { switch jtv := value.(type) { case json.Number: @@ -6913,7 +7250,7 @@ func awsRestjson1_deserializeOpDocumentDescribeSlotTypeOutput(v **DescribeSlotTy if err != nil { return err } - sv.CreationDateTime = ptr.Time(smithytime.ParseEpochSeconds(f64)) + sv.AggregationLastRefreshedDateTime = ptr.Time(smithytime.ParseEpochSeconds(f64)) default: return fmt.Errorf("expected Timestamp to be a JSON Number, got %T instead", value) @@ -6921,16 +7258,23 @@ func awsRestjson1_deserializeOpDocumentDescribeSlotTypeOutput(v **DescribeSlotTy } } - case "description": + case "aggregationWindowEndTime": if value != nil { - jtv, ok := value.(string) - if !ok { - return fmt.Errorf("expected Description to be of type string, got %T instead", value) + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.AggregationWindowEndTime = ptr.Time(smithytime.ParseEpochSeconds(f64)) + + default: + return fmt.Errorf("expected Timestamp to be a JSON Number, got %T instead", value) + } - sv.Description = ptr.String(jtv) } - case "lastUpdatedDateTime": + case "aggregationWindowStartTime": if value != nil { switch jtv := value.(type) { case json.Number: @@ -6938,7 +7282,7 @@ func awsRestjson1_deserializeOpDocumentDescribeSlotTypeOutput(v **DescribeSlotTy if err != nil { return err } - sv.LastUpdatedDateTime = ptr.Time(smithytime.ParseEpochSeconds(f64)) + sv.AggregationWindowStartTime = ptr.Time(smithytime.ParseEpochSeconds(f64)) default: return fmt.Errorf("expected Timestamp to be a JSON Number, got %T instead", value) @@ -6946,50 +7290,49 @@ func awsRestjson1_deserializeOpDocumentDescribeSlotTypeOutput(v **DescribeSlotTy } } - case "localeId": + case "botAliasId": if value != nil { jtv, ok := value.(string) if !ok { - return fmt.Errorf("expected LocaleId to be of type string, got %T instead", value) + return fmt.Errorf("expected BotAliasId to be of type string, got %T instead", value) } - sv.LocaleId = ptr.String(jtv) + sv.BotAliasId = ptr.String(jtv) } - case "parentSlotTypeSignature": + case "botId": if value != nil { jtv, ok := value.(string) if !ok { - return fmt.Errorf("expected SlotTypeSignature to be of type string, got %T instead", value) + return fmt.Errorf("expected Id to be of type string, got %T instead", value) } - sv.ParentSlotTypeSignature = ptr.String(jtv) + sv.BotId = ptr.String(jtv) } - case "slotTypeId": + case "botVersion": if value != nil { jtv, ok := value.(string) if !ok { - return fmt.Errorf("expected Id to be of type string, got %T instead", value) + return fmt.Errorf("expected BotVersion to be of type string, got %T instead", value) } - sv.SlotTypeId = ptr.String(jtv) + sv.BotVersion = ptr.String(jtv) } - case "slotTypeName": + case "localeId": if value != nil { jtv, ok := value.(string) if !ok { - return fmt.Errorf("expected Name to be of type string, got %T instead", value) + return fmt.Errorf("expected LocaleId to be of type string, got %T instead", value) } - sv.SlotTypeName = ptr.String(jtv) - } - - case "slotTypeValues": - if err := awsRestjson1_deserializeDocumentSlotTypeValues(&sv.SlotTypeValues, value); err != nil { - return err + sv.LocaleId = ptr.String(jtv) } - case "valueSelectionSetting": - if err := awsRestjson1_deserializeDocumentSlotValueSelectionSetting(&sv.ValueSelectionSetting, value); err != nil { - return err + case "nextToken": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected NextToken to be of type string, got %T instead", value) + } + sv.NextToken = ptr.String(jtv) } default: @@ -11835,6 +12178,147 @@ func awsRestjson1_deserializeErrorValidationException(response *smithyhttp.Respo return output } +func awsRestjson1_deserializeDocumentAggregatedUtterancesSummary(v **types.AggregatedUtterancesSummary, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.AggregatedUtterancesSummary + if *v == nil { + sv = &types.AggregatedUtterancesSummary{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "containsDataFromDeletedResources": + if value != nil { + jtv, ok := value.(bool) + if !ok { + return fmt.Errorf("expected BoxedBoolean to be of type *bool, got %T instead", value) + } + sv.ContainsDataFromDeletedResources = ptr.Bool(jtv) + } + + case "hitCount": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected HitCount to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.HitCount = ptr.Int32(int32(i64)) + } + + case "missedCount": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected MissedCount to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.MissedCount = ptr.Int32(int32(i64)) + } + + case "utterance": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected Utterance to be of type string, got %T instead", value) + } + sv.Utterance = ptr.String(jtv) + } + + case "utteranceFirstRecordedInAggregationDuration": + if value != nil { + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.UtteranceFirstRecordedInAggregationDuration = ptr.Time(smithytime.ParseEpochSeconds(f64)) + + default: + return fmt.Errorf("expected Timestamp to be a JSON Number, got %T instead", value) + + } + } + + case "utteranceLastRecordedInAggregationDuration": + if value != nil { + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.UtteranceLastRecordedInAggregationDuration = ptr.Time(smithytime.ParseEpochSeconds(f64)) + + default: + return fmt.Errorf("expected Timestamp to be a JSON Number, got %T instead", value) + + } + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + +func awsRestjson1_deserializeDocumentAggregatedUtterancesSummaryList(v *[]types.AggregatedUtterancesSummary, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.([]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var cv []types.AggregatedUtterancesSummary + if *v == nil { + cv = []types.AggregatedUtterancesSummary{} + } else { + cv = *v + } + + for _, value := range shape { + var col types.AggregatedUtterancesSummary + destAddr := &col + if err := awsRestjson1_deserializeDocumentAggregatedUtterancesSummary(&destAddr, value); err != nil { + return err + } + col = *destAddr + cv = append(cv, col) + + } + *v = cv + return nil +} + func awsRestjson1_deserializeDocumentAudioLogDestination(v **types.AudioLogDestination, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -15048,6 +15532,59 @@ func awsRestjson1_deserializeDocumentPromptSpecification(v **types.PromptSpecifi return nil } +func awsRestjson1_deserializeDocumentRelativeAggregationDuration(v **types.RelativeAggregationDuration, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.RelativeAggregationDuration + if *v == nil { + sv = &types.RelativeAggregationDuration{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "timeDimension": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected TimeDimension to be of type string, got %T instead", value) + } + sv.TimeDimension = types.TimeDimension(jtv) + } + + case "timeValue": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected TimeValue to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.TimeValue = int32(i64) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsRestjson1_deserializeDocumentResourceNotFoundException(v **types.ResourceNotFoundException, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -16399,6 +16936,42 @@ func awsRestjson1_deserializeDocumentThrottlingException(v **types.ThrottlingExc return nil } +func awsRestjson1_deserializeDocumentUtteranceAggregationDuration(v **types.UtteranceAggregationDuration, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.UtteranceAggregationDuration + if *v == nil { + sv = &types.UtteranceAggregationDuration{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "relativeAggregationDuration": + if err := awsRestjson1_deserializeDocumentRelativeAggregationDuration(&sv.RelativeAggregationDuration, value); err != nil { + return err + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsRestjson1_deserializeDocumentValidationException(v **types.ValidationException, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) diff --git a/service/lexmodelsv2/generated.json b/service/lexmodelsv2/generated.json index 3049b83dc8a..b1809a4e943 100644 --- a/service/lexmodelsv2/generated.json +++ b/service/lexmodelsv2/generated.json @@ -29,6 +29,7 @@ "api_op_DeleteResourcePolicyStatement.go", "api_op_DeleteSlot.go", "api_op_DeleteSlotType.go", + "api_op_DeleteUtterances.go", "api_op_DescribeBot.go", "api_op_DescribeBotAlias.go", "api_op_DescribeBotLocale.go", @@ -39,6 +40,7 @@ "api_op_DescribeResourcePolicy.go", "api_op_DescribeSlot.go", "api_op_DescribeSlotType.go", + "api_op_ListAggregatedUtterances.go", "api_op_ListBotAliases.go", "api_op_ListBotLocales.go", "api_op_ListBotVersions.go", diff --git a/service/lexmodelsv2/internal/endpoints/endpoints.go b/service/lexmodelsv2/internal/endpoints/endpoints.go index 67c37c372ff..93647868b24 100644 --- a/service/lexmodelsv2/internal/endpoints/endpoints.go +++ b/service/lexmodelsv2/internal/endpoints/endpoints.go @@ -63,7 +63,9 @@ var defaultPartitions = endpoints.Partitions{ RegionRegex: partitionRegexp.Aws, IsRegionalized: true, Endpoints: endpoints.Endpoints{ + "af-south-1": endpoints.Endpoint{}, "ap-northeast-1": endpoints.Endpoint{}, + "ap-northeast-2": endpoints.Endpoint{}, "ap-southeast-1": endpoints.Endpoint{}, "ap-southeast-2": endpoints.Endpoint{}, "ca-central-1": endpoints.Endpoint{}, diff --git a/service/lexmodelsv2/serializers.go b/service/lexmodelsv2/serializers.go index 52c3dd38a12..16d90e5602d 100644 --- a/service/lexmodelsv2/serializers.go +++ b/service/lexmodelsv2/serializers.go @@ -2063,6 +2063,72 @@ func awsRestjson1_serializeOpHttpBindingsDeleteSlotTypeInput(v *DeleteSlotTypeIn return nil } +type awsRestjson1_serializeOpDeleteUtterances struct { +} + +func (*awsRestjson1_serializeOpDeleteUtterances) ID() string { + return "OperationSerializer" +} + +func (m *awsRestjson1_serializeOpDeleteUtterances) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) ( + out middleware.SerializeOutput, metadata middleware.Metadata, err error, +) { + request, ok := in.Request.(*smithyhttp.Request) + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown transport type %T", in.Request)} + } + + input, ok := in.Parameters.(*DeleteUtterancesInput) + _ = input + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown input parameters type %T", in.Parameters)} + } + + opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/utterances") + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) + request.Method = "DELETE" + restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if err := awsRestjson1_serializeOpHttpBindingsDeleteUtterancesInput(input, restEncoder); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request.Request, err = restEncoder.Encode(request.Request); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + in.Request = request + + return next.HandleSerialize(ctx, in) +} +func awsRestjson1_serializeOpHttpBindingsDeleteUtterancesInput(v *DeleteUtterancesInput, encoder *httpbinding.Encoder) error { + if v == nil { + return fmt.Errorf("unsupported serialization of nil %T", v) + } + + if v.BotId == nil || len(*v.BotId) == 0 { + return &smithy.SerializationError{Err: fmt.Errorf("input member botId must not be empty")} + } + if v.BotId != nil { + if err := encoder.SetURI("botId").String(*v.BotId); err != nil { + return err + } + } + + if v.LocaleId != nil { + encoder.SetQuery("localeId").String(*v.LocaleId) + } + + if v.SessionId != nil { + encoder.SetQuery("sessionId").String(*v.SessionId) + } + + return nil +} + type awsRestjson1_serializeOpDescribeBot struct { } @@ -2769,6 +2835,128 @@ func awsRestjson1_serializeOpHttpBindingsDescribeSlotTypeInput(v *DescribeSlotTy return nil } +type awsRestjson1_serializeOpListAggregatedUtterances struct { +} + +func (*awsRestjson1_serializeOpListAggregatedUtterances) ID() string { + return "OperationSerializer" +} + +func (m *awsRestjson1_serializeOpListAggregatedUtterances) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) ( + out middleware.SerializeOutput, metadata middleware.Metadata, err error, +) { + request, ok := in.Request.(*smithyhttp.Request) + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown transport type %T", in.Request)} + } + + input, ok := in.Parameters.(*ListAggregatedUtterancesInput) + _ = input + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown input parameters type %T", in.Parameters)} + } + + opPath, opQuery := httpbinding.SplitURI("/bots/{botId}/aggregatedutterances") + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) + request.Method = "POST" + restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if err := awsRestjson1_serializeOpHttpBindingsListAggregatedUtterancesInput(input, restEncoder); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + restEncoder.SetHeader("Content-Type").String("application/json") + + jsonEncoder := smithyjson.NewEncoder() + if err := awsRestjson1_serializeOpDocumentListAggregatedUtterancesInput(input, jsonEncoder.Value); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request, err = request.SetStream(bytes.NewReader(jsonEncoder.Bytes())); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request.Request, err = restEncoder.Encode(request.Request); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + in.Request = request + + return next.HandleSerialize(ctx, in) +} +func awsRestjson1_serializeOpHttpBindingsListAggregatedUtterancesInput(v *ListAggregatedUtterancesInput, encoder *httpbinding.Encoder) error { + if v == nil { + return fmt.Errorf("unsupported serialization of nil %T", v) + } + + if v.BotId == nil || len(*v.BotId) == 0 { + return &smithy.SerializationError{Err: fmt.Errorf("input member botId must not be empty")} + } + if v.BotId != nil { + if err := encoder.SetURI("botId").String(*v.BotId); err != nil { + return err + } + } + + return nil +} + +func awsRestjson1_serializeOpDocumentListAggregatedUtterancesInput(v *ListAggregatedUtterancesInput, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if v.AggregationDuration != nil { + ok := object.Key("aggregationDuration") + if err := awsRestjson1_serializeDocumentUtteranceAggregationDuration(v.AggregationDuration, ok); err != nil { + return err + } + } + + if v.BotAliasId != nil { + ok := object.Key("botAliasId") + ok.String(*v.BotAliasId) + } + + if v.BotVersion != nil { + ok := object.Key("botVersion") + ok.String(*v.BotVersion) + } + + if v.Filters != nil { + ok := object.Key("filters") + if err := awsRestjson1_serializeDocumentAggregatedUtterancesFilters(v.Filters, ok); err != nil { + return err + } + } + + if v.LocaleId != nil { + ok := object.Key("localeId") + ok.String(*v.LocaleId) + } + + if v.MaxResults != nil { + ok := object.Key("maxResults") + ok.Integer(*v.MaxResults) + } + + if v.NextToken != nil { + ok := object.Key("nextToken") + ok.String(*v.NextToken) + } + + if v.SortBy != nil { + ok := object.Key("sortBy") + if err := awsRestjson1_serializeDocumentAggregatedUtterancesSortBy(v.SortBy, ok); err != nil { + return err + } + } + + return nil +} + type awsRestjson1_serializeOpListBotAliases struct { } @@ -5152,6 +5340,60 @@ func awsRestjson1_serializeOpDocumentUpdateSlotTypeInput(v *UpdateSlotTypeInput, return nil } +func awsRestjson1_serializeDocumentAggregatedUtterancesFilter(v *types.AggregatedUtterancesFilter, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if len(v.Name) > 0 { + ok := object.Key("name") + ok.String(string(v.Name)) + } + + if len(v.Operator) > 0 { + ok := object.Key("operator") + ok.String(string(v.Operator)) + } + + if v.Values != nil { + ok := object.Key("values") + if err := awsRestjson1_serializeDocumentFilterValues(v.Values, ok); err != nil { + return err + } + } + + return nil +} + +func awsRestjson1_serializeDocumentAggregatedUtterancesFilters(v []types.AggregatedUtterancesFilter, value smithyjson.Value) error { + array := value.Array() + defer array.Close() + + for i := range v { + av := array.Value() + if err := awsRestjson1_serializeDocumentAggregatedUtterancesFilter(&v[i], av); err != nil { + return err + } + } + return nil +} + +func awsRestjson1_serializeDocumentAggregatedUtterancesSortBy(v *types.AggregatedUtterancesSortBy, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if len(v.Attribute) > 0 { + ok := object.Key("attribute") + ok.String(string(v.Attribute)) + } + + if len(v.Order) > 0 { + ok := object.Key("order") + ok.String(string(v.Order)) + } + + return nil +} + func awsRestjson1_serializeDocumentAudioLogDestination(v *types.AudioLogDestination, value smithyjson.Value) error { object := value.Object() defer object.Close() @@ -6273,6 +6515,23 @@ func awsRestjson1_serializeDocumentPromptSpecification(v *types.PromptSpecificat return nil } +func awsRestjson1_serializeDocumentRelativeAggregationDuration(v *types.RelativeAggregationDuration, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if len(v.TimeDimension) > 0 { + ok := object.Key("timeDimension") + ok.String(string(v.TimeDimension)) + } + + { + ok := object.Key("timeValue") + ok.Integer(v.TimeValue) + } + + return nil +} + func awsRestjson1_serializeDocumentResponseSpecification(v *types.ResponseSpecification, value smithyjson.Value) error { object := value.Object() defer object.Close() @@ -6756,6 +7015,20 @@ func awsRestjson1_serializeDocumentTextLogSettingsList(v []types.TextLogSetting, return nil } +func awsRestjson1_serializeDocumentUtteranceAggregationDuration(v *types.UtteranceAggregationDuration, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if v.RelativeAggregationDuration != nil { + ok := object.Key("relativeAggregationDuration") + if err := awsRestjson1_serializeDocumentRelativeAggregationDuration(v.RelativeAggregationDuration, ok); err != nil { + return err + } + } + + return nil +} + func awsRestjson1_serializeDocumentVoiceSettings(v *types.VoiceSettings, value smithyjson.Value) error { object := value.Object() defer object.Close() diff --git a/service/lexmodelsv2/types/enums.go b/service/lexmodelsv2/types/enums.go index 617f8a94f10..c81e60e2530 100644 --- a/service/lexmodelsv2/types/enums.go +++ b/service/lexmodelsv2/types/enums.go @@ -2,6 +2,61 @@ package types +type AggregatedUtterancesFilterName string + +// Enum values for AggregatedUtterancesFilterName +const ( + AggregatedUtterancesFilterNameUtterance AggregatedUtterancesFilterName = "Utterance" +) + +// Values returns all known values for AggregatedUtterancesFilterName. 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 (AggregatedUtterancesFilterName) Values() []AggregatedUtterancesFilterName { + return []AggregatedUtterancesFilterName{ + "Utterance", + } +} + +type AggregatedUtterancesFilterOperator string + +// Enum values for AggregatedUtterancesFilterOperator +const ( + AggregatedUtterancesFilterOperatorContains AggregatedUtterancesFilterOperator = "CO" + AggregatedUtterancesFilterOperatorEquals AggregatedUtterancesFilterOperator = "EQ" +) + +// Values returns all known values for AggregatedUtterancesFilterOperator. 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 (AggregatedUtterancesFilterOperator) Values() []AggregatedUtterancesFilterOperator { + return []AggregatedUtterancesFilterOperator{ + "CO", + "EQ", + } +} + +type AggregatedUtterancesSortAttribute string + +// Enum values for AggregatedUtterancesSortAttribute +const ( + AggregatedUtterancesSortAttributeHitCount AggregatedUtterancesSortAttribute = "HitCount" + AggregatedUtterancesSortAttributeMissedCount AggregatedUtterancesSortAttribute = "MissedCount" +) + +// Values returns all known values for AggregatedUtterancesSortAttribute. 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 (AggregatedUtterancesSortAttribute) Values() []AggregatedUtterancesSortAttribute { + return []AggregatedUtterancesSortAttribute{ + "HitCount", + "MissedCount", + } +} + type BotAliasStatus string // Enum values for BotAliasStatus @@ -653,3 +708,23 @@ func (SortOrder) Values() []SortOrder { "Descending", } } + +type TimeDimension string + +// Enum values for TimeDimension +const ( + TimeDimensionHours TimeDimension = "Hours" + TimeDimensionDays TimeDimension = "Days" + TimeDimensionWeeks TimeDimension = "Weeks" +) + +// Values returns all known values for TimeDimension. 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 (TimeDimension) Values() []TimeDimension { + return []TimeDimension{ + "Hours", + "Days", + "Weeks", + } +} diff --git a/service/lexmodelsv2/types/errors.go b/service/lexmodelsv2/types/errors.go index 050b81d7df7..b89db30eebe 100644 --- a/service/lexmodelsv2/types/errors.go +++ b/service/lexmodelsv2/types/errors.go @@ -7,7 +7,9 @@ import ( smithy "github.com/aws/smithy-go" ) -// +// The action that you tried to perform couldn't be completed because the resource +// is in a conflicting state. For example, deleting a bot that is in the CREATING +// state. Try your request again. type ConflictException struct { Message *string @@ -26,7 +28,7 @@ func (e *ConflictException) ErrorMessage() string { func (e *ConflictException) ErrorCode() string { return "ConflictException" } func (e *ConflictException) ErrorFault() smithy.ErrorFault { return smithy.FaultClient } -// +// The service encountered an unexpected condition. Try your request again. type InternalServerException struct { Message *string @@ -45,7 +47,8 @@ func (e *InternalServerException) ErrorMessage() string { func (e *InternalServerException) ErrorCode() string { return "InternalServerException" } func (e *InternalServerException) ErrorFault() smithy.ErrorFault { return smithy.FaultServer } -// +// Your request couldn't be completed because one or more request fields aren't +// valid. Check the fields in your request and try again. type PreconditionFailedException struct { Message *string @@ -64,7 +67,8 @@ func (e *PreconditionFailedException) ErrorMessage() string { func (e *PreconditionFailedException) ErrorCode() string { return "PreconditionFailedException" } func (e *PreconditionFailedException) ErrorFault() smithy.ErrorFault { return smithy.FaultClient } -// +// You asked to describe a resource that doesn't exist. Check the resource that you +// are requesting and try again. type ResourceNotFoundException struct { Message *string @@ -83,7 +87,7 @@ func (e *ResourceNotFoundException) ErrorMessage() string { func (e *ResourceNotFoundException) ErrorCode() string { return "ResourceNotFoundException" } func (e *ResourceNotFoundException) ErrorFault() smithy.ErrorFault { return smithy.FaultClient } -// +// You have reached a quota for your bot. type ServiceQuotaExceededException struct { Message *string @@ -102,7 +106,7 @@ func (e *ServiceQuotaExceededException) ErrorMessage() string { func (e *ServiceQuotaExceededException) ErrorCode() string { return "ServiceQuotaExceededException" } func (e *ServiceQuotaExceededException) ErrorFault() smithy.ErrorFault { return smithy.FaultClient } -// +// Your request rate is too high. Reduce the frequency of requests. type ThrottlingException struct { Message *string @@ -123,7 +127,8 @@ func (e *ThrottlingException) ErrorMessage() string { func (e *ThrottlingException) ErrorCode() string { return "ThrottlingException" } func (e *ThrottlingException) ErrorFault() smithy.ErrorFault { return smithy.FaultClient } -// +// One of the input parameters in your request isn't valid. Check the parameters +// and try your request again. type ValidationException struct { Message *string diff --git a/service/lexmodelsv2/types/types.go b/service/lexmodelsv2/types/types.go index dd0f65e97e9..0fdc9ab7051 100644 --- a/service/lexmodelsv2/types/types.go +++ b/service/lexmodelsv2/types/types.go @@ -7,6 +7,82 @@ import ( "time" ) +// Filters responses returned by the ListAggregatedUtterances operation. +type AggregatedUtterancesFilter struct { + + // The name of the field to filter the utterance list. + // + // This member is required. + Name AggregatedUtterancesFilterName + + // The operator to use for the filter. Specify EQ when the ListAggregatedUtterances + // operation should return only utterances that equal the specified value. Specify + // CO when the ListAggregatedUtterances operation should return utterances that + // contain the specified value. + // + // This member is required. + Operator AggregatedUtterancesFilterOperator + + // The value to use for filtering the list of bots. + // + // This member is required. + Values []string + + noSmithyDocumentSerde +} + +// Specifies attributes for sorting a list of utterances. +type AggregatedUtterancesSortBy struct { + + // The utterance attribute to sort by. + // + // This member is required. + Attribute AggregatedUtterancesSortAttribute + + // Specifies whether to sort the aggregated utterances in ascending or descending + // order. + // + // This member is required. + Order SortOrder + + noSmithyDocumentSerde +} + +// Provides summary information for aggregated utterances. The +// ListAggregatedUtterances operations combines all instances of the same utterance +// into a single aggregated summary. +type AggregatedUtterancesSummary struct { + + // Aggregated utterance data may contain utterances from versions of your bot that + // have since been deleted. When the aggregated contains this kind of data, this + // field is set to true. + ContainsDataFromDeletedResources *bool + + // The number of times that the utterance was detected by Amazon Lex during the + // time period. When an utterance is detected, it activates an intent or a slot. + HitCount *int32 + + // The number of times that the utterance was missed by Amazon Lex An utterance is + // missed when it doesn't activate an intent or slot. + MissedCount *int32 + + // The text of the utterance. If the utterance was used with the RecognizeUtterance + // operation, the text is the transcription of the audio utterance. + Utterance *string + + // The date and time that the utterance was first recorded in the time window for + // aggregation. An utterance may have been sent to Amazon Lex before that time, but + // only utterances within the time window are counted. + UtteranceFirstRecordedInAggregationDuration *time.Time + + // The last date and time that an utterance was recorded in the time window for + // aggregation. An utterance may be sent to Amazon Lex after that time, but only + // utterances within the time window are counted. + UtteranceLastRecordedInAggregationDuration *time.Time + + noSmithyDocumentSerde +} + // The location of audio log files collected when conversation logging is enabled // for a bot. type AudioLogDestination struct { @@ -1109,6 +1185,47 @@ type PromptSpecification struct { noSmithyDocumentSerde } +// Specifies the time window that utterance statistics are returned for. The time +// window is always relative to the last time that the that utterances were +// aggregated. For example, if the ListAggregatedUtterances operation is called at +// 1600, the time window is set to 1 hour, and the last refresh time was 1530, only +// utterances made between 1430 and 1530 are returned. You can choose the time +// window that statistics should be returned for. +// +// * Hours - You can request +// utterance statistics for 1, 3, 6, 12, or 24 hour time windows. Statistics are +// refreshed every half hour for 1 hour time windows, and hourly for the other time +// windows. +// +// * Days - You can request utterance statistics for 3 days. Statistics +// are refreshed every 6 hours. +// +// * Weeks - You can see statistics for one or two +// weeks. Statistics are refreshed every 12 hours for one week time windows, and +// once per day for two week time windows. +type RelativeAggregationDuration struct { + + // The type of time period that the timeValue field represents. + // + // This member is required. + TimeDimension TimeDimension + + // The period of the time window to gather statistics for. The valid value depends + // on the setting of the timeDimension field. + // + // * Hours - 1/3/6/12/24 + // + // * Days - 3 + // + // * + // Weeks - 1/2 + // + // This member is required. + TimeValue int32 + + noSmithyDocumentSerde +} + // Specifies a list of message groups that Amazon Lex uses to respond the user // input. type ResponseSpecification struct { @@ -1518,6 +1635,18 @@ type TextLogSetting struct { noSmithyDocumentSerde } +// Provides parameters for setting the time window and duration for aggregating +// utterance data. +type UtteranceAggregationDuration struct { + + // The desired time window for aggregating utterances. + // + // This member is required. + RelativeAggregationDuration *RelativeAggregationDuration + + noSmithyDocumentSerde +} + // Defines settings for using an Amazon Polly voice to communicate with a user. type VoiceSettings struct { diff --git a/service/lexmodelsv2/validators.go b/service/lexmodelsv2/validators.go index 5e3fb7b243e..d5b232ef365 100644 --- a/service/lexmodelsv2/validators.go +++ b/service/lexmodelsv2/validators.go @@ -450,6 +450,26 @@ func (m *validateOpDeleteSlotType) HandleInitialize(ctx context.Context, in midd return next.HandleInitialize(ctx, in) } +type validateOpDeleteUtterances struct { +} + +func (*validateOpDeleteUtterances) ID() string { + return "OperationInputValidation" +} + +func (m *validateOpDeleteUtterances) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) ( + out middleware.InitializeOutput, metadata middleware.Metadata, err error, +) { + input, ok := in.Parameters.(*DeleteUtterancesInput) + if !ok { + return out, metadata, fmt.Errorf("unknown input parameters type %T", in.Parameters) + } + if err := validateOpDeleteUtterancesInput(input); err != nil { + return out, metadata, err + } + return next.HandleInitialize(ctx, in) +} + type validateOpDescribeBotAlias struct { } @@ -650,6 +670,26 @@ func (m *validateOpDescribeSlotType) HandleInitialize(ctx context.Context, in mi return next.HandleInitialize(ctx, in) } +type validateOpListAggregatedUtterances struct { +} + +func (*validateOpListAggregatedUtterances) ID() string { + return "OperationInputValidation" +} + +func (m *validateOpListAggregatedUtterances) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) ( + out middleware.InitializeOutput, metadata middleware.Metadata, err error, +) { + input, ok := in.Parameters.(*ListAggregatedUtterancesInput) + if !ok { + return out, metadata, fmt.Errorf("unknown input parameters type %T", in.Parameters) + } + if err := validateOpListAggregatedUtterancesInput(input); err != nil { + return out, metadata, err + } + return next.HandleInitialize(ctx, in) +} + type validateOpListBotAliases struct { } @@ -1198,6 +1238,10 @@ func addOpDeleteSlotTypeValidationMiddleware(stack *middleware.Stack) error { return stack.Initialize.Add(&validateOpDeleteSlotType{}, middleware.After) } +func addOpDeleteUtterancesValidationMiddleware(stack *middleware.Stack) error { + return stack.Initialize.Add(&validateOpDeleteUtterances{}, middleware.After) +} + func addOpDescribeBotAliasValidationMiddleware(stack *middleware.Stack) error { return stack.Initialize.Add(&validateOpDescribeBotAlias{}, middleware.After) } @@ -1238,6 +1282,10 @@ func addOpDescribeSlotTypeValidationMiddleware(stack *middleware.Stack) error { return stack.Initialize.Add(&validateOpDescribeSlotType{}, middleware.After) } +func addOpListAggregatedUtterancesValidationMiddleware(stack *middleware.Stack) error { + return stack.Initialize.Add(&validateOpListAggregatedUtterances{}, middleware.After) +} + func addOpListBotAliasesValidationMiddleware(stack *middleware.Stack) error { return stack.Initialize.Add(&validateOpListBotAliases{}, middleware.After) } @@ -1330,6 +1378,62 @@ func addOpUpdateSlotTypeValidationMiddleware(stack *middleware.Stack) error { return stack.Initialize.Add(&validateOpUpdateSlotType{}, middleware.After) } +func validateAggregatedUtterancesFilter(v *types.AggregatedUtterancesFilter) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "AggregatedUtterancesFilter"} + if len(v.Name) == 0 { + invalidParams.Add(smithy.NewErrParamRequired("Name")) + } + if v.Values == nil { + invalidParams.Add(smithy.NewErrParamRequired("Values")) + } + if len(v.Operator) == 0 { + invalidParams.Add(smithy.NewErrParamRequired("Operator")) + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + +func validateAggregatedUtterancesFilters(v []types.AggregatedUtterancesFilter) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "AggregatedUtterancesFilters"} + for i := range v { + if err := validateAggregatedUtterancesFilter(&v[i]); err != nil { + invalidParams.AddNested(fmt.Sprintf("[%d]", i), err.(smithy.InvalidParamsError)) + } + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + +func validateAggregatedUtterancesSortBy(v *types.AggregatedUtterancesSortBy) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "AggregatedUtterancesSortBy"} + if len(v.Attribute) == 0 { + invalidParams.Add(smithy.NewErrParamRequired("Attribute")) + } + if len(v.Order) == 0 { + invalidParams.Add(smithy.NewErrParamRequired("Order")) + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + func validateAudioLogDestination(v *types.AudioLogDestination) error { if v == nil { return nil @@ -2376,6 +2480,21 @@ func validatePromptSpecification(v *types.PromptSpecification) error { } } +func validateRelativeAggregationDuration(v *types.RelativeAggregationDuration) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "RelativeAggregationDuration"} + if len(v.TimeDimension) == 0 { + invalidParams.Add(smithy.NewErrParamRequired("TimeDimension")) + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + func validateResponseSpecification(v *types.ResponseSpecification) error { if v == nil { return nil @@ -2891,6 +3010,25 @@ func validateTextLogSettingsList(v []types.TextLogSetting) error { } } +func validateUtteranceAggregationDuration(v *types.UtteranceAggregationDuration) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "UtteranceAggregationDuration"} + if v.RelativeAggregationDuration == nil { + invalidParams.Add(smithy.NewErrParamRequired("RelativeAggregationDuration")) + } else if v.RelativeAggregationDuration != nil { + if err := validateRelativeAggregationDuration(v.RelativeAggregationDuration); err != nil { + invalidParams.AddNested("RelativeAggregationDuration", err.(smithy.InvalidParamsError)) + } + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + func validateVoiceSettings(v *types.VoiceSettings) error { if v == nil { return nil @@ -3489,6 +3627,21 @@ func validateOpDeleteSlotTypeInput(v *DeleteSlotTypeInput) error { } } +func validateOpDeleteUtterancesInput(v *DeleteUtterancesInput) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "DeleteUtterancesInput"} + if v.BotId == nil { + invalidParams.Add(smithy.NewErrParamRequired("BotId")) + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + func validateOpDescribeBotAliasInput(v *DescribeBotAliasInput) error { if v == nil { return nil @@ -3681,6 +3834,41 @@ func validateOpDescribeSlotTypeInput(v *DescribeSlotTypeInput) error { } } +func validateOpListAggregatedUtterancesInput(v *ListAggregatedUtterancesInput) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "ListAggregatedUtterancesInput"} + if v.BotId == nil { + invalidParams.Add(smithy.NewErrParamRequired("BotId")) + } + if v.LocaleId == nil { + invalidParams.Add(smithy.NewErrParamRequired("LocaleId")) + } + if v.AggregationDuration == nil { + invalidParams.Add(smithy.NewErrParamRequired("AggregationDuration")) + } else if v.AggregationDuration != nil { + if err := validateUtteranceAggregationDuration(v.AggregationDuration); err != nil { + invalidParams.AddNested("AggregationDuration", err.(smithy.InvalidParamsError)) + } + } + if v.SortBy != nil { + if err := validateAggregatedUtterancesSortBy(v.SortBy); err != nil { + invalidParams.AddNested("SortBy", err.(smithy.InvalidParamsError)) + } + } + if v.Filters != nil { + if err := validateAggregatedUtterancesFilters(v.Filters); err != nil { + invalidParams.AddNested("Filters", err.(smithy.InvalidParamsError)) + } + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + func validateOpListBotAliasesInput(v *ListBotAliasesInput) error { if v == nil { return nil diff --git a/service/lexruntimev2/internal/endpoints/endpoints.go b/service/lexruntimev2/internal/endpoints/endpoints.go index 59eaf2230f7..aa861590645 100644 --- a/service/lexruntimev2/internal/endpoints/endpoints.go +++ b/service/lexruntimev2/internal/endpoints/endpoints.go @@ -63,7 +63,9 @@ var defaultPartitions = endpoints.Partitions{ RegionRegex: partitionRegexp.Aws, IsRegionalized: true, Endpoints: endpoints.Endpoints{ + "af-south-1": endpoints.Endpoint{}, "ap-northeast-1": endpoints.Endpoint{}, + "ap-northeast-2": endpoints.Endpoint{}, "ap-southeast-1": endpoints.Endpoint{}, "ap-southeast-2": endpoints.Endpoint{}, "ca-central-1": endpoints.Endpoint{}, diff --git a/service/licensemanager/api_op_CheckoutLicense.go b/service/licensemanager/api_op_CheckoutLicense.go index cc3f53f80c0..b4b56bf611e 100644 --- a/service/licensemanager/api_op_CheckoutLicense.go +++ b/service/licensemanager/api_op_CheckoutLicense.go @@ -78,6 +78,9 @@ type CheckoutLicenseOutput struct { // Date and time at which the license checkout is issued. IssuedAt *string + // Amazon Resource Name (ARN) of the checkout license. + LicenseArn *string + // License consumption token. LicenseConsumptionToken *string diff --git a/service/licensemanager/api_op_CreateGrant.go b/service/licensemanager/api_op_CreateGrant.go index 7afe80229c0..22810523f12 100644 --- a/service/licensemanager/api_op_CreateGrant.go +++ b/service/licensemanager/api_op_CreateGrant.go @@ -12,7 +12,7 @@ import ( ) // Creates a grant for the specified license. A grant shares the use of license -// entitlements with specific AWS accounts. +// entitlements with specific Amazon Web Services accounts. func (c *Client) CreateGrant(ctx context.Context, params *CreateGrantInput, optFns ...func(*Options)) (*CreateGrantOutput, error) { if params == nil { params = &CreateGrantInput{} diff --git a/service/licensemanager/api_op_CreateGrantVersion.go b/service/licensemanager/api_op_CreateGrantVersion.go index 499807b0920..651d21c206d 100644 --- a/service/licensemanager/api_op_CreateGrantVersion.go +++ b/service/licensemanager/api_op_CreateGrantVersion.go @@ -52,6 +52,7 @@ type CreateGrantVersionInput struct { // Grant status. Status types.GrantStatus + // Grant status reason. StatusReason *string noSmithyDocumentSerde diff --git a/service/licensemanager/api_op_CreateLicenseConversionTaskForResource.go b/service/licensemanager/api_op_CreateLicenseConversionTaskForResource.go new file mode 100644 index 00000000000..a9eb9ecc51e --- /dev/null +++ b/service/licensemanager/api_op_CreateLicenseConversionTaskForResource.go @@ -0,0 +1,139 @@ +// Code generated by smithy-go-codegen DO NOT EDIT. + +package licensemanager + +import ( + "context" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/aws/signer/v4" + "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" + "github.com/aws/smithy-go/middleware" + smithyhttp "github.com/aws/smithy-go/transport/http" +) + +// Creates a new license conversion task. +func (c *Client) CreateLicenseConversionTaskForResource(ctx context.Context, params *CreateLicenseConversionTaskForResourceInput, optFns ...func(*Options)) (*CreateLicenseConversionTaskForResourceOutput, error) { + if params == nil { + params = &CreateLicenseConversionTaskForResourceInput{} + } + + result, metadata, err := c.invokeOperation(ctx, "CreateLicenseConversionTaskForResource", params, optFns, c.addOperationCreateLicenseConversionTaskForResourceMiddlewares) + if err != nil { + return nil, err + } + + out := result.(*CreateLicenseConversionTaskForResourceOutput) + out.ResultMetadata = metadata + return out, nil +} + +type CreateLicenseConversionTaskForResourceInput struct { + + // Information that identifies the license type you are converting to. For the + // structure of the destination license, see Convert a license type using the AWS + // CLI + // (https://docs.aws.amazon.com/license-manager/latest/userguide/conversion-procedures.html#conversion-cli) + // in the License Manager User Guide. + // + // This member is required. + DestinationLicenseContext *types.LicenseConversionContext + + // Amazon Resource Name (ARN) of the resource you are converting the license type + // for. + // + // This member is required. + ResourceArn *string + + // Information that identifies the license type you are converting from. For the + // structure of the source license, see Convert a license type using the AWS CLI + // (https://docs.aws.amazon.com/license-manager/latest/userguide/conversion-procedures.html#conversion-cli) + // in the License Manager User Guide. + // + // This member is required. + SourceLicenseContext *types.LicenseConversionContext + + noSmithyDocumentSerde +} + +type CreateLicenseConversionTaskForResourceOutput struct { + + // The ID of the created license type conversion task. + LicenseConversionTaskId *string + + // Metadata pertaining to the operation's result. + ResultMetadata middleware.Metadata + + noSmithyDocumentSerde +} + +func (c *Client) addOperationCreateLicenseConversionTaskForResourceMiddlewares(stack *middleware.Stack, options Options) (err error) { + err = stack.Serialize.Add(&awsAwsjson11_serializeOpCreateLicenseConversionTaskForResource{}, middleware.After) + if err != nil { + return err + } + err = stack.Deserialize.Add(&awsAwsjson11_deserializeOpCreateLicenseConversionTaskForResource{}, middleware.After) + if err != nil { + return err + } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddComputeContentLengthMiddleware(stack); err != nil { + return err + } + if err = addResolveEndpointMiddleware(stack, options); err != nil { + return err + } + if err = v4.AddComputePayloadSHA256Middleware(stack); err != nil { + return err + } + if err = addRetryMiddlewares(stack, options); err != nil { + return err + } + if err = addHTTPSignerV4Middleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddRawResponseToMetadata(stack); err != nil { + return err + } + if err = awsmiddleware.AddRecordResponseTiming(stack); err != nil { + return err + } + if err = addClientUserAgent(stack); err != nil { + return err + } + if err = smithyhttp.AddErrorCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = addOpCreateLicenseConversionTaskForResourceValidationMiddleware(stack); err != nil { + return err + } + if err = stack.Initialize.Add(newServiceMetadataMiddleware_opCreateLicenseConversionTaskForResource(options.Region), middleware.Before); err != nil { + return err + } + if err = addRequestIDRetrieverMiddleware(stack); err != nil { + return err + } + if err = addResponseErrorMiddleware(stack); err != nil { + return err + } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } + return nil +} + +func newServiceMetadataMiddleware_opCreateLicenseConversionTaskForResource(region string) *awsmiddleware.RegisterServiceMetadata { + return &awsmiddleware.RegisterServiceMetadata{ + Region: region, + ServiceID: ServiceID, + SigningName: "license-manager", + OperationName: "CreateLicenseConversionTaskForResource", + } +} diff --git a/service/licensemanager/api_op_CreateLicenseManagerReportGenerator.go b/service/licensemanager/api_op_CreateLicenseManagerReportGenerator.go index 4e2282c02a9..dd94dc49ae6 100644 --- a/service/licensemanager/api_op_CreateLicenseManagerReportGenerator.go +++ b/service/licensemanager/api_op_CreateLicenseManagerReportGenerator.go @@ -11,7 +11,7 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Creates a new report generator. +// Creates a report generator. func (c *Client) CreateLicenseManagerReportGenerator(ctx context.Context, params *CreateLicenseManagerReportGeneratorInput, optFns ...func(*Options)) (*CreateLicenseManagerReportGeneratorOutput, error) { if params == nil { params = &CreateLicenseManagerReportGeneratorInput{} @@ -54,11 +54,11 @@ type CreateLicenseManagerReportGeneratorInput struct { // Type of reports to generate. The following report types an be generated: // // * - // License configuration report - Reports on the number and details of consumed + // License configuration report - Reports the number and details of consumed // licenses for a license configuration. // - // * Resource report - Reports on the - // tracked licenses and resource consumption for a license configuration. + // * Resource report - Reports the tracked + // licenses and resource consumption for a license configuration. // // This member is required. Type []types.ReportType @@ -74,7 +74,7 @@ type CreateLicenseManagerReportGeneratorInput struct { type CreateLicenseManagerReportGeneratorOutput struct { - // The Amazon Resource Number (ARN) of the new report generator. + // The Amazon Resource Name (ARN) of the new report generator. LicenseManagerReportGeneratorArn *string // Metadata pertaining to the operation's result. diff --git a/service/licensemanager/api_op_DeleteGrant.go b/service/licensemanager/api_op_DeleteGrant.go index b859a36cb88..4313767054f 100644 --- a/service/licensemanager/api_op_DeleteGrant.go +++ b/service/licensemanager/api_op_DeleteGrant.go @@ -39,6 +39,7 @@ type DeleteGrantInput struct { // This member is required. Version *string + // The Status reason for the delete request. StatusReason *string noSmithyDocumentSerde diff --git a/service/licensemanager/api_op_DeleteLicense.go b/service/licensemanager/api_op_DeleteLicense.go index e3da5ee56e1..3757380de45 100644 --- a/service/licensemanager/api_op_DeleteLicense.go +++ b/service/licensemanager/api_op_DeleteLicense.go @@ -44,7 +44,7 @@ type DeleteLicenseInput struct { type DeleteLicenseOutput struct { - // Date on which the license is deleted. + // Date when the license is deleted. DeletionDate *string // License status. diff --git a/service/licensemanager/api_op_DeleteLicenseManagerReportGenerator.go b/service/licensemanager/api_op_DeleteLicenseManagerReportGenerator.go index f20864f0cf2..9876821fb2b 100644 --- a/service/licensemanager/api_op_DeleteLicenseManagerReportGenerator.go +++ b/service/licensemanager/api_op_DeleteLicenseManagerReportGenerator.go @@ -10,9 +10,9 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Delete an existing report generator. This action deletes the report generator, -// which stops it from generating future reports and cannot be reversed. However, -// the previous reports from this generator will remain in your S3 bucket. +// Deletes the specified report generator. This action deletes the report +// generator, which stops it from generating future reports. The action cannot be +// reversed. It has no effect on the previous reports from this generator. func (c *Client) DeleteLicenseManagerReportGenerator(ctx context.Context, params *DeleteLicenseManagerReportGeneratorInput, optFns ...func(*Options)) (*DeleteLicenseManagerReportGeneratorOutput, error) { if params == nil { params = &DeleteLicenseManagerReportGeneratorInput{} @@ -30,7 +30,7 @@ func (c *Client) DeleteLicenseManagerReportGenerator(ctx context.Context, params type DeleteLicenseManagerReportGeneratorInput struct { - // Amazon Resource Number (ARN) of the report generator that will be deleted. + // Amazon Resource Name (ARN) of the report generator to be deleted. // // This member is required. LicenseManagerReportGeneratorArn *string diff --git a/service/licensemanager/api_op_GetLicenseConfiguration.go b/service/licensemanager/api_op_GetLicenseConfiguration.go index 9c6e1c814f3..0515f60b8b0 100644 --- a/service/licensemanager/api_op_GetLicenseConfiguration.go +++ b/service/licensemanager/api_op_GetLicenseConfiguration.go @@ -66,7 +66,7 @@ type GetLicenseConfigurationOutput struct { // Sets the number of available licenses as a hard limit. LicenseCountHardLimit *bool - // Dimension on which the licenses are counted. + // Dimension for which the licenses are counted. LicenseCountingType types.LicenseCountingType // License rules. diff --git a/service/licensemanager/api_op_GetLicenseConversionTask.go b/service/licensemanager/api_op_GetLicenseConversionTask.go new file mode 100644 index 00000000000..0ff93db3d1a --- /dev/null +++ b/service/licensemanager/api_op_GetLicenseConversionTask.go @@ -0,0 +1,147 @@ +// Code generated by smithy-go-codegen DO NOT EDIT. + +package licensemanager + +import ( + "context" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/aws/signer/v4" + "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" + "github.com/aws/smithy-go/middleware" + smithyhttp "github.com/aws/smithy-go/transport/http" + "time" +) + +// Gets information about the specified license type conversion task. +func (c *Client) GetLicenseConversionTask(ctx context.Context, params *GetLicenseConversionTaskInput, optFns ...func(*Options)) (*GetLicenseConversionTaskOutput, error) { + if params == nil { + params = &GetLicenseConversionTaskInput{} + } + + result, metadata, err := c.invokeOperation(ctx, "GetLicenseConversionTask", params, optFns, c.addOperationGetLicenseConversionTaskMiddlewares) + if err != nil { + return nil, err + } + + out := result.(*GetLicenseConversionTaskOutput) + out.ResultMetadata = metadata + return out, nil +} + +type GetLicenseConversionTaskInput struct { + + // ID of the license type conversion task to retrieve information on. + // + // This member is required. + LicenseConversionTaskId *string + + noSmithyDocumentSerde +} + +type GetLicenseConversionTaskOutput struct { + + // Information about the license type converted to. + DestinationLicenseContext *types.LicenseConversionContext + + // Time at which the license type conversion task was completed. + EndTime *time.Time + + // ID of the license type conversion task. + LicenseConversionTaskId *string + + // Amount of time to complete the license type conversion. + LicenseConversionTime *time.Time + + // Amazon Resource Names (ARN) of the resources the license conversion task is + // associated with. + ResourceArn *string + + // Information about the license type converted from. + SourceLicenseContext *types.LicenseConversionContext + + // Time at which the license type conversion task was started . + StartTime *time.Time + + // Status of the license type conversion task. + Status types.LicenseConversionTaskStatus + + // The status message for the conversion task. + StatusMessage *string + + // Metadata pertaining to the operation's result. + ResultMetadata middleware.Metadata + + noSmithyDocumentSerde +} + +func (c *Client) addOperationGetLicenseConversionTaskMiddlewares(stack *middleware.Stack, options Options) (err error) { + err = stack.Serialize.Add(&awsAwsjson11_serializeOpGetLicenseConversionTask{}, middleware.After) + if err != nil { + return err + } + err = stack.Deserialize.Add(&awsAwsjson11_deserializeOpGetLicenseConversionTask{}, middleware.After) + if err != nil { + return err + } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddComputeContentLengthMiddleware(stack); err != nil { + return err + } + if err = addResolveEndpointMiddleware(stack, options); err != nil { + return err + } + if err = v4.AddComputePayloadSHA256Middleware(stack); err != nil { + return err + } + if err = addRetryMiddlewares(stack, options); err != nil { + return err + } + if err = addHTTPSignerV4Middleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddRawResponseToMetadata(stack); err != nil { + return err + } + if err = awsmiddleware.AddRecordResponseTiming(stack); err != nil { + return err + } + if err = addClientUserAgent(stack); err != nil { + return err + } + if err = smithyhttp.AddErrorCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = addOpGetLicenseConversionTaskValidationMiddleware(stack); err != nil { + return err + } + if err = stack.Initialize.Add(newServiceMetadataMiddleware_opGetLicenseConversionTask(options.Region), middleware.Before); err != nil { + return err + } + if err = addRequestIDRetrieverMiddleware(stack); err != nil { + return err + } + if err = addResponseErrorMiddleware(stack); err != nil { + return err + } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } + return nil +} + +func newServiceMetadataMiddleware_opGetLicenseConversionTask(region string) *awsmiddleware.RegisterServiceMetadata { + return &awsmiddleware.RegisterServiceMetadata{ + Region: region, + ServiceID: ServiceID, + SigningName: "license-manager", + OperationName: "GetLicenseConversionTask", + } +} diff --git a/service/licensemanager/api_op_GetLicenseManagerReportGenerator.go b/service/licensemanager/api_op_GetLicenseManagerReportGenerator.go index 028481cacbe..50bd69e6dbe 100644 --- a/service/licensemanager/api_op_GetLicenseManagerReportGenerator.go +++ b/service/licensemanager/api_op_GetLicenseManagerReportGenerator.go @@ -11,7 +11,7 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Gets information on the specified report generator. +// Gets information about the specified report generator. func (c *Client) GetLicenseManagerReportGenerator(ctx context.Context, params *GetLicenseManagerReportGeneratorInput, optFns ...func(*Options)) (*GetLicenseManagerReportGeneratorOutput, error) { if params == nil { params = &GetLicenseManagerReportGeneratorInput{} @@ -29,7 +29,7 @@ func (c *Client) GetLicenseManagerReportGenerator(ctx context.Context, params *G type GetLicenseManagerReportGeneratorInput struct { - // mazon Resource Number (ARN) of the report generator to retrieve information on. + // Amazon Resource Name (ARN) of the report generator. // // This member is required. LicenseManagerReportGeneratorArn *string @@ -39,7 +39,8 @@ type GetLicenseManagerReportGeneratorInput struct { type GetLicenseManagerReportGeneratorOutput struct { - // A report generator that creates periodic reports on your license configurations. + // A report generator that creates periodic reports about your license + // configurations. ReportGenerator *types.ReportGenerator // Metadata pertaining to the operation's result. diff --git a/service/licensemanager/api_op_GetServiceSettings.go b/service/licensemanager/api_op_GetServiceSettings.go index 627651fb2cb..6c14d8148b9 100644 --- a/service/licensemanager/api_op_GetServiceSettings.go +++ b/service/licensemanager/api_op_GetServiceSettings.go @@ -36,11 +36,11 @@ type GetServiceSettingsOutput struct { // Indicates whether cross-account discovery is enabled. EnableCrossAccountsDiscovery *bool - // Amazon Resource Name (ARN) of the AWS resource share. The License Manager - // management account provides member accounts with access to this share. + // Amazon Resource Name (ARN) of the resource share. The License Manager management + // account provides member accounts with access to this share. LicenseManagerResourceShareArn *string - // Indicates whether AWS Organizations is integrated with License Manager for + // Indicates whether Organizations is integrated with License Manager for // cross-account discovery. OrganizationConfiguration *types.OrganizationConfiguration diff --git a/service/licensemanager/api_op_ListLicenseConfigurations.go b/service/licensemanager/api_op_ListLicenseConfigurations.go index 36d4a6da8da..7582ef14d16 100644 --- a/service/licensemanager/api_op_ListLicenseConfigurations.go +++ b/service/licensemanager/api_op_ListLicenseConfigurations.go @@ -32,9 +32,9 @@ type ListLicenseConfigurationsInput struct { // Filters to scope the results. The following filters and logical operators are // supported: // - // * licenseCountingType - The dimension on which licenses are counted. - // Possible values are vCPU | Instance | Core | Socket. Logical operators are - // EQUALS | NOT_EQUALS. + // * licenseCountingType - The dimension for which licenses are + // counted. Possible values are vCPU | Instance | Core | Socket. Logical operators + // are EQUALS | NOT_EQUALS. // // * enforceLicenseCount - A Boolean value that indicates // whether hard license enforcement is used. Logical operators are EQUALS | diff --git a/service/licensemanager/api_op_ListLicenseConversionTasks.go b/service/licensemanager/api_op_ListLicenseConversionTasks.go new file mode 100644 index 00000000000..53b265233f3 --- /dev/null +++ b/service/licensemanager/api_op_ListLicenseConversionTasks.go @@ -0,0 +1,125 @@ +// Code generated by smithy-go-codegen DO NOT EDIT. + +package licensemanager + +import ( + "context" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/aws/signer/v4" + "github.com/aws/aws-sdk-go-v2/service/licensemanager/types" + "github.com/aws/smithy-go/middleware" + smithyhttp "github.com/aws/smithy-go/transport/http" +) + +// Lists the license type conversion tasks for your account. +func (c *Client) ListLicenseConversionTasks(ctx context.Context, params *ListLicenseConversionTasksInput, optFns ...func(*Options)) (*ListLicenseConversionTasksOutput, error) { + if params == nil { + params = &ListLicenseConversionTasksInput{} + } + + result, metadata, err := c.invokeOperation(ctx, "ListLicenseConversionTasks", params, optFns, c.addOperationListLicenseConversionTasksMiddlewares) + if err != nil { + return nil, err + } + + out := result.(*ListLicenseConversionTasksOutput) + out.ResultMetadata = metadata + return out, nil +} + +type ListLicenseConversionTasksInput struct { + + // Filters to scope the results. Valid filters are ResourceArns and Status. + Filters []types.Filter + + // Maximum number of results to return in a single call. + MaxResults *int32 + + // Token for the next set of results. + NextToken *string + + noSmithyDocumentSerde +} + +type ListLicenseConversionTasksOutput struct { + + // Information about the license configuration tasks for your account. + LicenseConversionTasks []types.LicenseConversionTask + + // Token for the next set of results. + NextToken *string + + // Metadata pertaining to the operation's result. + ResultMetadata middleware.Metadata + + noSmithyDocumentSerde +} + +func (c *Client) addOperationListLicenseConversionTasksMiddlewares(stack *middleware.Stack, options Options) (err error) { + err = stack.Serialize.Add(&awsAwsjson11_serializeOpListLicenseConversionTasks{}, middleware.After) + if err != nil { + return err + } + err = stack.Deserialize.Add(&awsAwsjson11_deserializeOpListLicenseConversionTasks{}, middleware.After) + if err != nil { + return err + } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddComputeContentLengthMiddleware(stack); err != nil { + return err + } + if err = addResolveEndpointMiddleware(stack, options); err != nil { + return err + } + if err = v4.AddComputePayloadSHA256Middleware(stack); err != nil { + return err + } + if err = addRetryMiddlewares(stack, options); err != nil { + return err + } + if err = addHTTPSignerV4Middleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddRawResponseToMetadata(stack); err != nil { + return err + } + if err = awsmiddleware.AddRecordResponseTiming(stack); err != nil { + return err + } + if err = addClientUserAgent(stack); err != nil { + return err + } + if err = smithyhttp.AddErrorCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = stack.Initialize.Add(newServiceMetadataMiddleware_opListLicenseConversionTasks(options.Region), middleware.Before); err != nil { + return err + } + if err = addRequestIDRetrieverMiddleware(stack); err != nil { + return err + } + if err = addResponseErrorMiddleware(stack); err != nil { + return err + } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } + return nil +} + +func newServiceMetadataMiddleware_opListLicenseConversionTasks(region string) *awsmiddleware.RegisterServiceMetadata { + return &awsmiddleware.RegisterServiceMetadata{ + Region: region, + ServiceID: ServiceID, + SigningName: "license-manager", + OperationName: "ListLicenseConversionTasks", + } +} diff --git a/service/licensemanager/api_op_ListLicenseManagerReportGenerators.go b/service/licensemanager/api_op_ListLicenseManagerReportGenerators.go index af38df7455d..51d3903483f 100644 --- a/service/licensemanager/api_op_ListLicenseManagerReportGenerators.go +++ b/service/licensemanager/api_op_ListLicenseManagerReportGenerators.go @@ -49,7 +49,8 @@ type ListLicenseManagerReportGeneratorsOutput struct { // Token for the next set of results. NextToken *string - // A report generator that creates periodic reports on your license configurations. + // A report generator that creates periodic reports about your license + // configurations. ReportGenerators []types.ReportGenerator // Metadata pertaining to the operation's result. diff --git a/service/licensemanager/api_op_ListResourceInventory.go b/service/licensemanager/api_op_ListResourceInventory.go index 766bfab907c..58d510e1cde 100644 --- a/service/licensemanager/api_op_ListResourceInventory.go +++ b/service/licensemanager/api_op_ListResourceInventory.go @@ -32,26 +32,26 @@ type ListResourceInventoryInput struct { // Filters to scope the results. The following filters and logical operators are // supported: // - // * account_id - The ID of the AWS account that owns the resource. - // Logical operators are EQUALS | NOT_EQUALS. + // * account_id - The ID of the Amazon Web Services account that owns + // the resource. Logical operators are EQUALS | NOT_EQUALS. // - // * application_name - The name of the - // application. Logical operators are EQUALS | BEGINS_WITH. + // * application_name - + // The name of the application. Logical operators are EQUALS | BEGINS_WITH. // - // * license_included - - // The type of license included. Logical operators are EQUALS | NOT_EQUALS. - // Possible values are sql-server-enterprise | sql-server-standard | sql-server-web - // | windows-server-datacenter. + // * + // license_included - The type of license included. Logical operators are EQUALS | + // NOT_EQUALS. Possible values are sql-server-enterprise | sql-server-standard | + // sql-server-web | windows-server-datacenter. // - // * platform - The platform of the resource. Logical - // operators are EQUALS | BEGINS_WITH. + // * platform - The platform of the + // resource. Logical operators are EQUALS | BEGINS_WITH. // - // * resource_id - The ID of the resource. - // Logical operators are EQUALS | NOT_EQUALS. + // * resource_id - The ID of + // the resource. Logical operators are EQUALS | NOT_EQUALS. // - // * tag: - The key/value combination - // of a tag assigned to the resource. Logical operators are EQUALS (single account) - // or EQUALS | NOT_EQUALS (cross account). + // * tag: - The key/value + // combination of a tag assigned to the resource. Logical operators are EQUALS + // (single account) or EQUALS | NOT_EQUALS (cross account). Filters []types.InventoryFilter // Maximum number of results to return in a single call. diff --git a/service/licensemanager/api_op_UpdateLicenseManagerReportGenerator.go b/service/licensemanager/api_op_UpdateLicenseManagerReportGenerator.go index 0cd57569628..be74b662c66 100644 --- a/service/licensemanager/api_op_UpdateLicenseManagerReportGenerator.go +++ b/service/licensemanager/api_op_UpdateLicenseManagerReportGenerator.go @@ -12,7 +12,7 @@ import ( ) // Updates a report generator. After you make changes to a report generator, it -// will start generating new reports within 60 minutes of being updated. +// starts generating new reports within 60 minutes of being updated. func (c *Client) UpdateLicenseManagerReportGenerator(ctx context.Context, params *UpdateLicenseManagerReportGeneratorInput, optFns ...func(*Options)) (*UpdateLicenseManagerReportGeneratorOutput, error) { if params == nil { params = &UpdateLicenseManagerReportGeneratorInput{} @@ -36,18 +36,17 @@ type UpdateLicenseManagerReportGeneratorInput struct { // This member is required. ClientToken *string - // Amazon Resource Number (ARN) of the report generator to update. + // Amazon Resource Name (ARN) of the report generator to update. // // This member is required. LicenseManagerReportGeneratorArn *string - // ? + // The report context. // // This member is required. ReportContext *types.ReportContext - // Frequency by which reports are generated. The following options are avaiable: - // ??? What are the APi value options? + // Frequency by which reports are generated. // // This member is required. ReportFrequency *types.ReportFrequency @@ -57,14 +56,14 @@ type UpdateLicenseManagerReportGeneratorInput struct { // This member is required. ReportGeneratorName *string - // Type of reports to generate. The following report types an be generated: + // Type of reports to generate. The following report types are supported: // // * - // License configuration report - Reports on the number and details of consumed + // License configuration report - Reports the number and details of consumed // licenses for a license configuration. // - // * Resource report - Reports on the - // tracked licenses and resource consumption for a license configuration. + // * Resource report - Reports the tracked + // licenses and resource consumption for a license configuration. // // This member is required. Type []types.ReportType diff --git a/service/licensemanager/api_op_UpdateLicenseSpecificationsForResource.go b/service/licensemanager/api_op_UpdateLicenseSpecificationsForResource.go index e98671d9e83..7433bf2ed87 100644 --- a/service/licensemanager/api_op_UpdateLicenseSpecificationsForResource.go +++ b/service/licensemanager/api_op_UpdateLicenseSpecificationsForResource.go @@ -11,11 +11,11 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Adds or removes the specified license configurations for the specified AWS -// resource. You can update the license specifications of AMIs, instances, and -// hosts. You cannot update the license specifications for launch templates and AWS -// CloudFormation templates, as they send license configurations to the operation -// that creates the resource. +// Adds or removes the specified license configurations for the specified Amazon +// Web Services resource. You can update the license specifications of AMIs, +// instances, and hosts. You cannot update the license specifications for launch +// templates and CloudFormation templates, as they send license configurations to +// the operation that creates the resource. func (c *Client) UpdateLicenseSpecificationsForResource(ctx context.Context, params *UpdateLicenseSpecificationsForResourceInput, optFns ...func(*Options)) (*UpdateLicenseSpecificationsForResourceOutput, error) { if params == nil { params = &UpdateLicenseSpecificationsForResourceInput{} @@ -33,7 +33,7 @@ func (c *Client) UpdateLicenseSpecificationsForResource(ctx context.Context, par type UpdateLicenseSpecificationsForResourceInput struct { - // Amazon Resource Name (ARN) of the AWS resource. + // Amazon Resource Name (ARN) of the Amazon Web Services resource. // // This member is required. ResourceArn *string diff --git a/service/licensemanager/api_op_UpdateServiceSettings.go b/service/licensemanager/api_op_UpdateServiceSettings.go index bde5e819966..f21e5517a9c 100644 --- a/service/licensemanager/api_op_UpdateServiceSettings.go +++ b/service/licensemanager/api_op_UpdateServiceSettings.go @@ -32,7 +32,7 @@ type UpdateServiceSettingsInput struct { // Activates cross-account discovery. EnableCrossAccountsDiscovery *bool - // Enables integration with AWS Organizations for cross-account discovery. + // Enables integration with Organizations for cross-account discovery. OrganizationConfiguration *types.OrganizationConfiguration // Amazon Resource Name (ARN) of the Amazon S3 bucket where the License Manager diff --git a/service/licensemanager/deserializers.go b/service/licensemanager/deserializers.go index 4a80ccd526c..c21f19ea9e9 100644 --- a/service/licensemanager/deserializers.go +++ b/service/licensemanager/deserializers.go @@ -1072,6 +1072,132 @@ func awsAwsjson11_deserializeOpErrorCreateLicenseConfiguration(response *smithyh } } +type awsAwsjson11_deserializeOpCreateLicenseConversionTaskForResource struct { +} + +func (*awsAwsjson11_deserializeOpCreateLicenseConversionTaskForResource) ID() string { + return "OperationDeserializer" +} + +func (m *awsAwsjson11_deserializeOpCreateLicenseConversionTaskForResource) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) ( + out middleware.DeserializeOutput, metadata middleware.Metadata, err error, +) { + out, metadata, err = next.HandleDeserialize(ctx, in) + if err != nil { + return out, metadata, err + } + + response, ok := out.RawResponse.(*smithyhttp.Response) + if !ok { + return out, metadata, &smithy.DeserializationError{Err: fmt.Errorf("unknown transport type %T", out.RawResponse)} + } + + if response.StatusCode < 200 || response.StatusCode >= 300 { + return out, metadata, awsAwsjson11_deserializeOpErrorCreateLicenseConversionTaskForResource(response, &metadata) + } + output := &CreateLicenseConversionTaskForResourceOutput{} + out.Result = output + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(response.Body, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + var shape interface{} + if err := decoder.Decode(&shape); err != nil && err != io.EOF { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + err = awsAwsjson11_deserializeOpDocumentCreateLicenseConversionTaskForResourceOutput(&output, shape) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + return out, metadata, err +} + +func awsAwsjson11_deserializeOpErrorCreateLicenseConversionTaskForResource(response *smithyhttp.Response, metadata *middleware.Metadata) error { + var errorBuffer bytes.Buffer + if _, err := io.Copy(&errorBuffer, response.Body); err != nil { + return &smithy.DeserializationError{Err: fmt.Errorf("failed to copy error response body, %w", err)} + } + errorBody := bytes.NewReader(errorBuffer.Bytes()) + + errorCode := "UnknownError" + errorMessage := errorCode + + code := response.Header.Get("X-Amzn-ErrorType") + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(errorBody, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + code, message, err := restjson.GetErrorInfo(decoder) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return err + } + + errorBody.Seek(0, io.SeekStart) + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + if len(message) != 0 { + errorMessage = message + } + + switch { + case strings.EqualFold("AccessDeniedException", errorCode): + return awsAwsjson11_deserializeErrorAccessDeniedException(response, errorBody) + + case strings.EqualFold("AuthorizationException", errorCode): + return awsAwsjson11_deserializeErrorAuthorizationException(response, errorBody) + + case strings.EqualFold("InvalidParameterValueException", errorCode): + return awsAwsjson11_deserializeErrorInvalidParameterValueException(response, errorBody) + + case strings.EqualFold("RateLimitExceededException", errorCode): + return awsAwsjson11_deserializeErrorRateLimitExceededException(response, errorBody) + + case strings.EqualFold("ServerInternalException", errorCode): + return awsAwsjson11_deserializeErrorServerInternalException(response, errorBody) + + case strings.EqualFold("ValidationException", errorCode): + return awsAwsjson11_deserializeErrorValidationException(response, errorBody) + + default: + genericError := &smithy.GenericAPIError{ + Code: errorCode, + Message: errorMessage, + } + return genericError + + } +} + type awsAwsjson11_deserializeOpCreateLicenseManagerReportGenerator struct { } @@ -2743,6 +2869,129 @@ func awsAwsjson11_deserializeOpErrorGetLicenseConfiguration(response *smithyhttp } } +type awsAwsjson11_deserializeOpGetLicenseConversionTask struct { +} + +func (*awsAwsjson11_deserializeOpGetLicenseConversionTask) ID() string { + return "OperationDeserializer" +} + +func (m *awsAwsjson11_deserializeOpGetLicenseConversionTask) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) ( + out middleware.DeserializeOutput, metadata middleware.Metadata, err error, +) { + out, metadata, err = next.HandleDeserialize(ctx, in) + if err != nil { + return out, metadata, err + } + + response, ok := out.RawResponse.(*smithyhttp.Response) + if !ok { + return out, metadata, &smithy.DeserializationError{Err: fmt.Errorf("unknown transport type %T", out.RawResponse)} + } + + if response.StatusCode < 200 || response.StatusCode >= 300 { + return out, metadata, awsAwsjson11_deserializeOpErrorGetLicenseConversionTask(response, &metadata) + } + output := &GetLicenseConversionTaskOutput{} + out.Result = output + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(response.Body, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + var shape interface{} + if err := decoder.Decode(&shape); err != nil && err != io.EOF { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + err = awsAwsjson11_deserializeOpDocumentGetLicenseConversionTaskOutput(&output, shape) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + return out, metadata, err +} + +func awsAwsjson11_deserializeOpErrorGetLicenseConversionTask(response *smithyhttp.Response, metadata *middleware.Metadata) error { + var errorBuffer bytes.Buffer + if _, err := io.Copy(&errorBuffer, response.Body); err != nil { + return &smithy.DeserializationError{Err: fmt.Errorf("failed to copy error response body, %w", err)} + } + errorBody := bytes.NewReader(errorBuffer.Bytes()) + + errorCode := "UnknownError" + errorMessage := errorCode + + code := response.Header.Get("X-Amzn-ErrorType") + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(errorBody, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + code, message, err := restjson.GetErrorInfo(decoder) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return err + } + + errorBody.Seek(0, io.SeekStart) + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + if len(message) != 0 { + errorMessage = message + } + + switch { + case strings.EqualFold("AccessDeniedException", errorCode): + return awsAwsjson11_deserializeErrorAccessDeniedException(response, errorBody) + + case strings.EqualFold("AuthorizationException", errorCode): + return awsAwsjson11_deserializeErrorAuthorizationException(response, errorBody) + + case strings.EqualFold("InvalidParameterValueException", errorCode): + return awsAwsjson11_deserializeErrorInvalidParameterValueException(response, errorBody) + + case strings.EqualFold("RateLimitExceededException", errorCode): + return awsAwsjson11_deserializeErrorRateLimitExceededException(response, errorBody) + + case strings.EqualFold("ServerInternalException", errorCode): + return awsAwsjson11_deserializeErrorServerInternalException(response, errorBody) + + default: + genericError := &smithy.GenericAPIError{ + Code: errorCode, + Message: errorMessage, + } + return genericError + + } +} + type awsAwsjson11_deserializeOpGetLicenseManagerReportGenerator struct { } @@ -3625,6 +3874,129 @@ func awsAwsjson11_deserializeOpErrorListLicenseConfigurations(response *smithyht } } +type awsAwsjson11_deserializeOpListLicenseConversionTasks struct { +} + +func (*awsAwsjson11_deserializeOpListLicenseConversionTasks) ID() string { + return "OperationDeserializer" +} + +func (m *awsAwsjson11_deserializeOpListLicenseConversionTasks) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) ( + out middleware.DeserializeOutput, metadata middleware.Metadata, err error, +) { + out, metadata, err = next.HandleDeserialize(ctx, in) + if err != nil { + return out, metadata, err + } + + response, ok := out.RawResponse.(*smithyhttp.Response) + if !ok { + return out, metadata, &smithy.DeserializationError{Err: fmt.Errorf("unknown transport type %T", out.RawResponse)} + } + + if response.StatusCode < 200 || response.StatusCode >= 300 { + return out, metadata, awsAwsjson11_deserializeOpErrorListLicenseConversionTasks(response, &metadata) + } + output := &ListLicenseConversionTasksOutput{} + out.Result = output + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(response.Body, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + var shape interface{} + if err := decoder.Decode(&shape); err != nil && err != io.EOF { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + err = awsAwsjson11_deserializeOpDocumentListLicenseConversionTasksOutput(&output, shape) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + return out, metadata, err +} + +func awsAwsjson11_deserializeOpErrorListLicenseConversionTasks(response *smithyhttp.Response, metadata *middleware.Metadata) error { + var errorBuffer bytes.Buffer + if _, err := io.Copy(&errorBuffer, response.Body); err != nil { + return &smithy.DeserializationError{Err: fmt.Errorf("failed to copy error response body, %w", err)} + } + errorBody := bytes.NewReader(errorBuffer.Bytes()) + + errorCode := "UnknownError" + errorMessage := errorCode + + code := response.Header.Get("X-Amzn-ErrorType") + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(errorBody, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + code, message, err := restjson.GetErrorInfo(decoder) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return err + } + + errorBody.Seek(0, io.SeekStart) + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + if len(message) != 0 { + errorMessage = message + } + + switch { + case strings.EqualFold("AccessDeniedException", errorCode): + return awsAwsjson11_deserializeErrorAccessDeniedException(response, errorBody) + + case strings.EqualFold("AuthorizationException", errorCode): + return awsAwsjson11_deserializeErrorAuthorizationException(response, errorBody) + + case strings.EqualFold("InvalidParameterValueException", errorCode): + return awsAwsjson11_deserializeErrorInvalidParameterValueException(response, errorBody) + + case strings.EqualFold("RateLimitExceededException", errorCode): + return awsAwsjson11_deserializeErrorRateLimitExceededException(response, errorBody) + + case strings.EqualFold("ServerInternalException", errorCode): + return awsAwsjson11_deserializeErrorServerInternalException(response, errorBody) + + default: + genericError := &smithy.GenericAPIError{ + Code: errorCode, + Message: errorMessage, + } + return genericError + + } +} + type awsAwsjson11_deserializeOpListLicenseManagerReportGenerators struct { } @@ -8203,11 +8575,181 @@ func awsAwsjson11_deserializeDocumentLicenseConfigurations(v *[]types.LicenseCon cv = append(cv, col) } - *v = cv + *v = cv + return nil +} + +func awsAwsjson11_deserializeDocumentLicenseConfigurationUsage(v **types.LicenseConfigurationUsage, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.LicenseConfigurationUsage + if *v == nil { + sv = &types.LicenseConfigurationUsage{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "AssociationTime": + if value != nil { + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.AssociationTime = ptr.Time(smithytime.ParseEpochSeconds(f64)) + + default: + return fmt.Errorf("expected DateTime to be a JSON Number, got %T instead", value) + + } + } + + case "ConsumedLicenses": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected BoxLong to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.ConsumedLicenses = ptr.Int64(i64) + } + + case "ResourceArn": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected String to be of type string, got %T instead", value) + } + sv.ResourceArn = ptr.String(jtv) + } + + case "ResourceOwnerId": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected String to be of type string, got %T instead", value) + } + sv.ResourceOwnerId = ptr.String(jtv) + } + + case "ResourceStatus": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected String to be of type string, got %T instead", value) + } + sv.ResourceStatus = ptr.String(jtv) + } + + case "ResourceType": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected ResourceType to be of type string, got %T instead", value) + } + sv.ResourceType = types.ResourceType(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + +func awsAwsjson11_deserializeDocumentLicenseConfigurationUsageList(v *[]types.LicenseConfigurationUsage, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.([]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var cv []types.LicenseConfigurationUsage + if *v == nil { + cv = []types.LicenseConfigurationUsage{} + } else { + cv = *v + } + + for _, value := range shape { + var col types.LicenseConfigurationUsage + destAddr := &col + if err := awsAwsjson11_deserializeDocumentLicenseConfigurationUsage(&destAddr, value); err != nil { + return err + } + col = *destAddr + cv = append(cv, col) + + } + *v = cv + return nil +} + +func awsAwsjson11_deserializeDocumentLicenseConversionContext(v **types.LicenseConversionContext, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.LicenseConversionContext + if *v == nil { + sv = &types.LicenseConversionContext{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "UsageOperation": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected UsageOperation to be of type string, got %T instead", value) + } + sv.UsageOperation = ptr.String(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv return nil } -func awsAwsjson11_deserializeDocumentLicenseConfigurationUsage(v **types.LicenseConfigurationUsage, value interface{}) error { +func awsAwsjson11_deserializeDocumentLicenseConversionTask(v **types.LicenseConversionTask, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) } @@ -8220,16 +8762,21 @@ func awsAwsjson11_deserializeDocumentLicenseConfigurationUsage(v **types.License return fmt.Errorf("unexpected JSON type %v", value) } - var sv *types.LicenseConfigurationUsage + var sv *types.LicenseConversionTask if *v == nil { - sv = &types.LicenseConfigurationUsage{} + sv = &types.LicenseConversionTask{} } else { sv = *v } for key, value := range shape { switch key { - case "AssociationTime": + case "DestinationLicenseContext": + if err := awsAwsjson11_deserializeDocumentLicenseConversionContext(&sv.DestinationLicenseContext, value); err != nil { + return err + } + + case "EndTime": if value != nil { switch jtv := value.(type) { case json.Number: @@ -8237,7 +8784,7 @@ func awsAwsjson11_deserializeDocumentLicenseConfigurationUsage(v **types.License if err != nil { return err } - sv.AssociationTime = ptr.Time(smithytime.ParseEpochSeconds(f64)) + sv.EndTime = ptr.Time(smithytime.ParseEpochSeconds(f64)) default: return fmt.Errorf("expected DateTime to be a JSON Number, got %T instead", value) @@ -8245,17 +8792,29 @@ func awsAwsjson11_deserializeDocumentLicenseConfigurationUsage(v **types.License } } - case "ConsumedLicenses": + case "LicenseConversionTaskId": if value != nil { - jtv, ok := value.(json.Number) + jtv, ok := value.(string) if !ok { - return fmt.Errorf("expected BoxLong to be json.Number, got %T instead", value) + return fmt.Errorf("expected LicenseConversionTaskId to be of type string, got %T instead", value) } - i64, err := jtv.Int64() - if err != nil { - return err + sv.LicenseConversionTaskId = ptr.String(jtv) + } + + case "LicenseConversionTime": + if value != nil { + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.LicenseConversionTime = ptr.Time(smithytime.ParseEpochSeconds(f64)) + + default: + return fmt.Errorf("expected DateTime to be a JSON Number, got %T instead", value) + } - sv.ConsumedLicenses = ptr.Int64(i64) } case "ResourceArn": @@ -8267,31 +8826,43 @@ func awsAwsjson11_deserializeDocumentLicenseConfigurationUsage(v **types.License sv.ResourceArn = ptr.String(jtv) } - case "ResourceOwnerId": + case "SourceLicenseContext": + if err := awsAwsjson11_deserializeDocumentLicenseConversionContext(&sv.SourceLicenseContext, value); err != nil { + return err + } + + case "StartTime": if value != nil { - jtv, ok := value.(string) - if !ok { - return fmt.Errorf("expected String to be of type string, got %T instead", value) + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.StartTime = ptr.Time(smithytime.ParseEpochSeconds(f64)) + + default: + return fmt.Errorf("expected DateTime to be a JSON Number, got %T instead", value) + } - sv.ResourceOwnerId = ptr.String(jtv) } - case "ResourceStatus": + case "Status": if value != nil { jtv, ok := value.(string) if !ok { - return fmt.Errorf("expected String to be of type string, got %T instead", value) + return fmt.Errorf("expected LicenseConversionTaskStatus to be of type string, got %T instead", value) } - sv.ResourceStatus = ptr.String(jtv) + sv.Status = types.LicenseConversionTaskStatus(jtv) } - case "ResourceType": + case "StatusMessage": if value != nil { jtv, ok := value.(string) if !ok { - return fmt.Errorf("expected ResourceType to be of type string, got %T instead", value) + return fmt.Errorf("expected String to be of type string, got %T instead", value) } - sv.ResourceType = types.ResourceType(jtv) + sv.StatusMessage = ptr.String(jtv) } default: @@ -8303,7 +8874,7 @@ func awsAwsjson11_deserializeDocumentLicenseConfigurationUsage(v **types.License return nil } -func awsAwsjson11_deserializeDocumentLicenseConfigurationUsageList(v *[]types.LicenseConfigurationUsage, value interface{}) error { +func awsAwsjson11_deserializeDocumentLicenseConversionTasks(v *[]types.LicenseConversionTask, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) } @@ -8316,17 +8887,17 @@ func awsAwsjson11_deserializeDocumentLicenseConfigurationUsageList(v *[]types.Li return fmt.Errorf("unexpected JSON type %v", value) } - var cv []types.LicenseConfigurationUsage + var cv []types.LicenseConversionTask if *v == nil { - cv = []types.LicenseConfigurationUsage{} + cv = []types.LicenseConversionTask{} } else { cv = *v } for _, value := range shape { - var col types.LicenseConfigurationUsage + var col types.LicenseConversionTask destAddr := &col - if err := awsAwsjson11_deserializeDocumentLicenseConfigurationUsage(&destAddr, value); err != nil { + if err := awsAwsjson11_deserializeDocumentLicenseConversionTask(&destAddr, value); err != nil { return err } col = *destAddr @@ -10442,6 +11013,15 @@ func awsAwsjson11_deserializeOpDocumentCheckoutLicenseOutput(v **CheckoutLicense sv.IssuedAt = ptr.String(jtv) } + case "LicenseArn": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected String to be of type string, got %T instead", value) + } + sv.LicenseArn = ptr.String(jtv) + } + case "LicenseConsumptionToken": if value != nil { jtv, ok := value.(string) @@ -10634,6 +11214,46 @@ func awsAwsjson11_deserializeOpDocumentCreateLicenseConfigurationOutput(v **Crea return nil } +func awsAwsjson11_deserializeOpDocumentCreateLicenseConversionTaskForResourceOutput(v **CreateLicenseConversionTaskForResourceOutput, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *CreateLicenseConversionTaskForResourceOutput + if *v == nil { + sv = &CreateLicenseConversionTaskForResourceOutput{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "LicenseConversionTaskId": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected LicenseConversionTaskId to be of type string, got %T instead", value) + } + sv.LicenseConversionTaskId = ptr.String(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsAwsjson11_deserializeOpDocumentCreateLicenseManagerReportGeneratorOutput(v **CreateLicenseManagerReportGeneratorOutput, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -11341,6 +11961,131 @@ func awsAwsjson11_deserializeOpDocumentGetLicenseConfigurationOutput(v **GetLice return nil } +func awsAwsjson11_deserializeOpDocumentGetLicenseConversionTaskOutput(v **GetLicenseConversionTaskOutput, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *GetLicenseConversionTaskOutput + if *v == nil { + sv = &GetLicenseConversionTaskOutput{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "DestinationLicenseContext": + if err := awsAwsjson11_deserializeDocumentLicenseConversionContext(&sv.DestinationLicenseContext, value); err != nil { + return err + } + + case "EndTime": + if value != nil { + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.EndTime = ptr.Time(smithytime.ParseEpochSeconds(f64)) + + default: + return fmt.Errorf("expected DateTime to be a JSON Number, got %T instead", value) + + } + } + + case "LicenseConversionTaskId": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected LicenseConversionTaskId to be of type string, got %T instead", value) + } + sv.LicenseConversionTaskId = ptr.String(jtv) + } + + case "LicenseConversionTime": + if value != nil { + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.LicenseConversionTime = ptr.Time(smithytime.ParseEpochSeconds(f64)) + + default: + return fmt.Errorf("expected DateTime to be a JSON Number, got %T instead", value) + + } + } + + case "ResourceArn": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected String to be of type string, got %T instead", value) + } + sv.ResourceArn = ptr.String(jtv) + } + + case "SourceLicenseContext": + if err := awsAwsjson11_deserializeDocumentLicenseConversionContext(&sv.SourceLicenseContext, value); err != nil { + return err + } + + case "StartTime": + if value != nil { + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.StartTime = ptr.Time(smithytime.ParseEpochSeconds(f64)) + + default: + return fmt.Errorf("expected DateTime to be a JSON Number, got %T instead", value) + + } + } + + case "Status": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected LicenseConversionTaskStatus to be of type string, got %T instead", value) + } + sv.Status = types.LicenseConversionTaskStatus(jtv) + } + + case "StatusMessage": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected String to be of type string, got %T instead", value) + } + sv.StatusMessage = ptr.String(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsAwsjson11_deserializeOpDocumentGetLicenseManagerReportGeneratorOutput(v **GetLicenseManagerReportGeneratorOutput, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -11701,6 +12446,51 @@ func awsAwsjson11_deserializeOpDocumentListLicenseConfigurationsOutput(v **ListL return nil } +func awsAwsjson11_deserializeOpDocumentListLicenseConversionTasksOutput(v **ListLicenseConversionTasksOutput, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *ListLicenseConversionTasksOutput + if *v == nil { + sv = &ListLicenseConversionTasksOutput{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "LicenseConversionTasks": + if err := awsAwsjson11_deserializeDocumentLicenseConversionTasks(&sv.LicenseConversionTasks, value); err != nil { + return err + } + + case "NextToken": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected String to be of type string, got %T instead", value) + } + sv.NextToken = ptr.String(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsAwsjson11_deserializeOpDocumentListLicenseManagerReportGeneratorsOutput(v **ListLicenseManagerReportGeneratorsOutput, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) diff --git a/service/licensemanager/doc.go b/service/licensemanager/doc.go index 1af1c912232..fd312236f86 100644 --- a/service/licensemanager/doc.go +++ b/service/licensemanager/doc.go @@ -3,6 +3,6 @@ // Package licensemanager provides the API client, operations, and parameter types // for AWS License Manager. // -// AWS License Manager AWS License Manager makes it easier to manage licenses from -// software vendors across multiple AWS accounts and on-premises servers. +// License Manager makes it easier to manage licenses from software vendors across +// multiple Amazon Web Services accounts and on-premises servers. package licensemanager diff --git a/service/licensemanager/generated.json b/service/licensemanager/generated.json index 7dff800cb4f..7ed2165c1ac 100644 --- a/service/licensemanager/generated.json +++ b/service/licensemanager/generated.json @@ -13,6 +13,7 @@ "api_op_CreateGrantVersion.go", "api_op_CreateLicense.go", "api_op_CreateLicenseConfiguration.go", + "api_op_CreateLicenseConversionTaskForResource.go", "api_op_CreateLicenseManagerReportGenerator.go", "api_op_CreateLicenseVersion.go", "api_op_CreateToken.go", @@ -26,6 +27,7 @@ "api_op_GetGrant.go", "api_op_GetLicense.go", "api_op_GetLicenseConfiguration.go", + "api_op_GetLicenseConversionTask.go", "api_op_GetLicenseManagerReportGenerator.go", "api_op_GetLicenseUsage.go", "api_op_GetServiceSettings.go", @@ -33,6 +35,7 @@ "api_op_ListDistributedGrants.go", "api_op_ListFailuresForLicenseConfigurationOperations.go", "api_op_ListLicenseConfigurations.go", + "api_op_ListLicenseConversionTasks.go", "api_op_ListLicenseManagerReportGenerators.go", "api_op_ListLicenseSpecificationsForResource.go", "api_op_ListLicenseVersions.go", diff --git a/service/licensemanager/serializers.go b/service/licensemanager/serializers.go index 3ecf8e31b38..7486a744575 100644 --- a/service/licensemanager/serializers.go +++ b/service/licensemanager/serializers.go @@ -390,6 +390,53 @@ func (m *awsAwsjson11_serializeOpCreateLicenseConfiguration) HandleSerialize(ctx return next.HandleSerialize(ctx, in) } +type awsAwsjson11_serializeOpCreateLicenseConversionTaskForResource struct { +} + +func (*awsAwsjson11_serializeOpCreateLicenseConversionTaskForResource) ID() string { + return "OperationSerializer" +} + +func (m *awsAwsjson11_serializeOpCreateLicenseConversionTaskForResource) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) ( + out middleware.SerializeOutput, metadata middleware.Metadata, err error, +) { + request, ok := in.Request.(*smithyhttp.Request) + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown transport type %T", in.Request)} + } + + input, ok := in.Parameters.(*CreateLicenseConversionTaskForResourceInput) + _ = input + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown input parameters type %T", in.Parameters)} + } + + request.Request.URL.Path = "/" + request.Request.Method = "POST" + httpBindingEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + httpBindingEncoder.SetHeader("Content-Type").String("application/x-amz-json-1.1") + httpBindingEncoder.SetHeader("X-Amz-Target").String("AWSLicenseManager.CreateLicenseConversionTaskForResource") + + jsonEncoder := smithyjson.NewEncoder() + if err := awsAwsjson11_serializeOpDocumentCreateLicenseConversionTaskForResourceInput(input, jsonEncoder.Value); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request, err = request.SetStream(bytes.NewReader(jsonEncoder.Bytes())); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request.Request, err = httpBindingEncoder.Encode(request.Request); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + in.Request = request + + return next.HandleSerialize(ctx, in) +} + type awsAwsjson11_serializeOpCreateLicenseManagerReportGenerator struct { } @@ -1001,6 +1048,53 @@ func (m *awsAwsjson11_serializeOpGetLicenseConfiguration) HandleSerialize(ctx co return next.HandleSerialize(ctx, in) } +type awsAwsjson11_serializeOpGetLicenseConversionTask struct { +} + +func (*awsAwsjson11_serializeOpGetLicenseConversionTask) ID() string { + return "OperationSerializer" +} + +func (m *awsAwsjson11_serializeOpGetLicenseConversionTask) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) ( + out middleware.SerializeOutput, metadata middleware.Metadata, err error, +) { + request, ok := in.Request.(*smithyhttp.Request) + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown transport type %T", in.Request)} + } + + input, ok := in.Parameters.(*GetLicenseConversionTaskInput) + _ = input + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown input parameters type %T", in.Parameters)} + } + + request.Request.URL.Path = "/" + request.Request.Method = "POST" + httpBindingEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + httpBindingEncoder.SetHeader("Content-Type").String("application/x-amz-json-1.1") + httpBindingEncoder.SetHeader("X-Amz-Target").String("AWSLicenseManager.GetLicenseConversionTask") + + jsonEncoder := smithyjson.NewEncoder() + if err := awsAwsjson11_serializeOpDocumentGetLicenseConversionTaskInput(input, jsonEncoder.Value); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request, err = request.SetStream(bytes.NewReader(jsonEncoder.Bytes())); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request.Request, err = httpBindingEncoder.Encode(request.Request); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + in.Request = request + + return next.HandleSerialize(ctx, in) +} + type awsAwsjson11_serializeOpGetLicenseManagerReportGenerator struct { } @@ -1330,6 +1424,53 @@ func (m *awsAwsjson11_serializeOpListLicenseConfigurations) HandleSerialize(ctx return next.HandleSerialize(ctx, in) } +type awsAwsjson11_serializeOpListLicenseConversionTasks struct { +} + +func (*awsAwsjson11_serializeOpListLicenseConversionTasks) ID() string { + return "OperationSerializer" +} + +func (m *awsAwsjson11_serializeOpListLicenseConversionTasks) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) ( + out middleware.SerializeOutput, metadata middleware.Metadata, err error, +) { + request, ok := in.Request.(*smithyhttp.Request) + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown transport type %T", in.Request)} + } + + input, ok := in.Parameters.(*ListLicenseConversionTasksInput) + _ = input + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown input parameters type %T", in.Parameters)} + } + + request.Request.URL.Path = "/" + request.Request.Method = "POST" + httpBindingEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + httpBindingEncoder.SetHeader("Content-Type").String("application/x-amz-json-1.1") + httpBindingEncoder.SetHeader("X-Amz-Target").String("AWSLicenseManager.ListLicenseConversionTasks") + + jsonEncoder := smithyjson.NewEncoder() + if err := awsAwsjson11_serializeOpDocumentListLicenseConversionTasksInput(input, jsonEncoder.Value); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request, err = request.SetStream(bytes.NewReader(jsonEncoder.Bytes())); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request.Request, err = httpBindingEncoder.Encode(request.Request); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + in.Request = request + + return next.HandleSerialize(ctx, in) +} + type awsAwsjson11_serializeOpListLicenseManagerReportGenerators struct { } @@ -2403,6 +2544,18 @@ func awsAwsjson11_serializeDocumentIssuer(v *types.Issuer, value smithyjson.Valu return nil } +func awsAwsjson11_serializeDocumentLicenseConversionContext(v *types.LicenseConversionContext, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if v.UsageOperation != nil { + ok := object.Key("UsageOperation") + ok.String(*v.UsageOperation) + } + + return nil +} + func awsAwsjson11_serializeDocumentLicenseSpecification(v *types.LicenseSpecification, value smithyjson.Value) error { object := value.Object() defer object.Close() @@ -2929,6 +3082,32 @@ func awsAwsjson11_serializeOpDocumentCreateLicenseConfigurationInput(v *CreateLi return nil } +func awsAwsjson11_serializeOpDocumentCreateLicenseConversionTaskForResourceInput(v *CreateLicenseConversionTaskForResourceInput, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if v.DestinationLicenseContext != nil { + ok := object.Key("DestinationLicenseContext") + if err := awsAwsjson11_serializeDocumentLicenseConversionContext(v.DestinationLicenseContext, ok); err != nil { + return err + } + } + + if v.ResourceArn != nil { + ok := object.Key("ResourceArn") + ok.String(*v.ResourceArn) + } + + if v.SourceLicenseContext != nil { + ok := object.Key("SourceLicenseContext") + if err := awsAwsjson11_serializeDocumentLicenseConversionContext(v.SourceLicenseContext, ok); err != nil { + return err + } + } + + return nil +} + func awsAwsjson11_serializeOpDocumentCreateLicenseInput(v *CreateLicenseInput, value smithyjson.Value) error { object := value.Object() defer object.Close() @@ -3304,6 +3483,18 @@ func awsAwsjson11_serializeOpDocumentGetLicenseConfigurationInput(v *GetLicenseC return nil } +func awsAwsjson11_serializeOpDocumentGetLicenseConversionTaskInput(v *GetLicenseConversionTaskInput, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if v.LicenseConversionTaskId != nil { + ok := object.Key("LicenseConversionTaskId") + ok.String(*v.LicenseConversionTaskId) + } + + return nil +} + func awsAwsjson11_serializeOpDocumentGetLicenseInput(v *GetLicenseInput, value smithyjson.Value) error { object := value.Object() defer object.Close() @@ -3458,6 +3649,30 @@ func awsAwsjson11_serializeOpDocumentListLicenseConfigurationsInput(v *ListLicen return nil } +func awsAwsjson11_serializeOpDocumentListLicenseConversionTasksInput(v *ListLicenseConversionTasksInput, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if v.Filters != nil { + ok := object.Key("Filters") + if err := awsAwsjson11_serializeDocumentFilters(v.Filters, ok); err != nil { + return err + } + } + + if v.MaxResults != nil { + ok := object.Key("MaxResults") + ok.Integer(*v.MaxResults) + } + + if v.NextToken != nil { + ok := object.Key("NextToken") + ok.String(*v.NextToken) + } + + return nil +} + func awsAwsjson11_serializeOpDocumentListLicenseManagerReportGeneratorsInput(v *ListLicenseManagerReportGeneratorsInput, value smithyjson.Value) error { object := value.Object() defer object.Close() diff --git a/service/licensemanager/types/enums.go b/service/licensemanager/types/enums.go index 843105fe0c9..e4899d84e4e 100644 --- a/service/licensemanager/types/enums.go +++ b/service/licensemanager/types/enums.go @@ -272,6 +272,26 @@ func (LicenseConfigurationStatus) Values() []LicenseConfigurationStatus { } } +type LicenseConversionTaskStatus string + +// Enum values for LicenseConversionTaskStatus +const ( + LicenseConversionTaskStatusInProgress LicenseConversionTaskStatus = "IN_PROGRESS" + LicenseConversionTaskStatusSucceeded LicenseConversionTaskStatus = "SUCCEEDED" + LicenseConversionTaskStatusFailed LicenseConversionTaskStatus = "FAILED" +) + +// Values returns all known values for LicenseConversionTaskStatus. 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 (LicenseConversionTaskStatus) Values() []LicenseConversionTaskStatus { + return []LicenseConversionTaskStatus{ + "IN_PROGRESS", + "SUCCEEDED", + "FAILED", + } +} + type LicenseCountingType string // Enum values for LicenseCountingType diff --git a/service/licensemanager/types/errors.go b/service/licensemanager/types/errors.go index 0b8dc09e97c..6d23d2e0ef8 100644 --- a/service/licensemanager/types/errors.go +++ b/service/licensemanager/types/errors.go @@ -26,8 +26,8 @@ func (e *AccessDeniedException) ErrorMessage() string { func (e *AccessDeniedException) ErrorCode() string { return "AccessDeniedException" } func (e *AccessDeniedException) ErrorFault() smithy.ErrorFault { return smithy.FaultClient } -// The AWS user account does not have permission to perform the action. Check the -// IAM policy associated with this account. +// The Amazon Web Services user account does not have permission to perform the +// action. Check the IAM policy associated with this account. type AuthorizationException struct { Message *string diff --git a/service/licensemanager/types/types.go b/service/licensemanager/types/types.go index bc1773122e6..09b29aece84 100644 --- a/service/licensemanager/types/types.go +++ b/service/licensemanager/types/types.go @@ -291,8 +291,8 @@ type Issuer struct { // This member is required. Name *string - // Asymmetric CMK from AWS Key Management Service. The CMK must have a key usage of - // sign and verify, and support the RSASSA-PSS SHA-256 signing algorithm. + // Asymmetric KMS key from Key Management Service. The KMS key must have a key + // usage of sign and verify, and support the RSASSA-PSS SHA-256 signing algorithm. SignKey *string noSmithyDocumentSerde @@ -307,14 +307,14 @@ type IssuerDetails struct { // Issuer name. Name *string - // Asymmetric CMK from AWS Key Management Service. The CMK must have a key usage of - // sign and verify, and support the RSASSA-PSS SHA-256 signing algorithm. + // Asymmetric KMS key from Key Management Service. The KMS key must have a key + // usage of sign and verify, and support the RSASSA-PSS SHA-256 signing algorithm. SignKey *string noSmithyDocumentSerde } -// Software license that is managed in AWS License Manager. +// Software license that is managed in License Manager. type License struct { // License beneficiary. @@ -433,7 +433,7 @@ type LicenseConfigurationAssociation struct { // Amazon Resource Name (ARN) of the resource. ResourceArn *string - // ID of the AWS account that owns the resource consuming licenses. + // ID of the Amazon Web Services account that owns the resource consuming licenses. ResourceOwnerId *string // Type of server resource. @@ -466,6 +466,53 @@ type LicenseConfigurationUsage struct { noSmithyDocumentSerde } +// Information about a license type conversion task. +type LicenseConversionContext struct { + + // The Usage operation value that corresponds to the license type you are + // converting your resource from. For more information about which platforms + // correspond to which usage operation values see Sample data: usage operation by + // platform + // (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/billing-info-fields.html#billing-info) + UsageOperation *string + + noSmithyDocumentSerde +} + +// Information about a license type conversion task. +type LicenseConversionTask struct { + + // Information about the license type this conversion task converted to. + DestinationLicenseContext *LicenseConversionContext + + // The time the conversion task was completed. + EndTime *time.Time + + // The ID of the license type conversion task. + LicenseConversionTaskId *string + + // The time the usage operation value of the resource was changed. + LicenseConversionTime *time.Time + + // The Amazon Resource Name (ARN) of the resource associated with the license type + // conversion task. + ResourceArn *string + + // Information about the license type this conversion task converted from. + SourceLicenseContext *LicenseConversionContext + + // The time the conversion task was started at. + StartTime *time.Time + + // The status of the conversion task. + Status LicenseConversionTaskStatus + + // The status message for the conversion task. + StatusMessage *string + + noSmithyDocumentSerde +} + // Describes the failure of a license operation. type LicenseOperationFailure struct { @@ -487,7 +534,7 @@ type LicenseOperationFailure struct { // Amazon Resource Name (ARN) of the resource. ResourceArn *string - // ID of the AWS account that owns the resource. + // ID of the Amazon Web Services account that owns the resource. ResourceOwnerId *string // Resource type. @@ -543,10 +590,10 @@ type Metadata struct { noSmithyDocumentSerde } -// Configuration information for AWS Organizations. +// Configuration information for Organizations. type OrganizationConfiguration struct { - // Enables AWS Organization integration. + // Enables Organizations integration. // // This member is required. EnableIntegration bool @@ -581,29 +628,30 @@ type ProductInformation struct { // platform type. Logical operator is EQUALS. // // * Tag:key - The key of a tag - // attached to an AWS resource you wish to exclude from automated discovery. - // Logical operator is NOT_EQUALS. The key for your tag must be appended to Tag: - // following the example: Tag:name-of-your-key. ProductInformationFilterValue is - // optional if you are not using values for the key. + // attached to an Amazon Web Services resource you wish to exclude from automated + // discovery. Logical operator is NOT_EQUALS. The key for your tag must be appended + // to Tag: following the example: Tag:name-of-your-key. + // ProductInformationFilterValue is optional if you are not using values for the + // key. // - // * AccountId - The 12-digit ID - // of an AWS account you wish to exclude from automated discovery. Logical operator - // is NOT_EQUALS. + // * AccountId - The 12-digit ID of an Amazon Web Services account you wish + // to exclude from automated discovery. Logical operator is NOT_EQUALS. // - // * License Included - The type of license included. Logical - // operators are EQUALS and NOT_EQUALS. Possible values are: sql-server-enterprise - // | sql-server-standard | sql-server-web | windows-server-datacenter. + // * License + // Included - The type of license included. Logical operators are EQUALS and + // NOT_EQUALS. Possible values are: sql-server-enterprise | sql-server-standard | + // sql-server-web | windows-server-datacenter. // - // The - // following filters and logical operators are supported when the resource type is - // RDS: + // The following filters and logical + // operators are supported when the resource type is RDS: // - // * Engine Edition - The edition of the database engine. Logical operator is - // EQUALS. Possible values are: oracle-ee | oracle-se | oracle-se1 | oracle-se2. + // * Engine Edition - The + // edition of the database engine. Logical operator is EQUALS. Possible values are: + // oracle-ee | oracle-se | oracle-se1 | oracle-se2. // - // * - // License Pack - The license pack. Logical operator is EQUALS. Possible values - // are: data guard | diagnostic pack sqlt | tuning pack sqlt | ols | olap. + // * License Pack - The license + // pack. Logical operator is EQUALS. Possible values are: data guard | diagnostic + // pack sqlt | tuning pack sqlt | ols | olap. // // This member is required. ProductInformationFilterList []ProductInformationFilter @@ -655,6 +703,7 @@ type ReceivedMetadata struct { // Received status. ReceivedStatus ReceivedStatus + // Received status reason. ReceivedStatusReason *string noSmithyDocumentSerde @@ -663,7 +712,7 @@ type ReceivedMetadata struct { // Details of the license configuration that this generator reports on. type ReportContext struct { - // Amazon Resource Number (ARN) of the license configuration that this generator + // Amazon Resource Name (ARN) of the license configuration that this generator // reports on. // // This member is required. @@ -672,14 +721,14 @@ type ReportContext struct { noSmithyDocumentSerde } -// Details on how frequently reports are generated. +// Details about how frequently reports are generated. type ReportFrequency struct { // Time period between each report. The period can be daily, weekly, or monthly. Period ReportFrequencyType - // Number of times within the frequency period that a report will be generated. - // Currently only 1 is supported. + // Number of times within the frequency period that a report is generated. The only + // supported value is 1. Value *int32 noSmithyDocumentSerde @@ -703,16 +752,16 @@ type ReportGenerator struct { // Status of the last report generation attempt. LastRunStatus *string - // Amazon Resource Number (ARN) of the report generator. + // Amazon Resource Name (ARN) of the report generator. LicenseManagerReportGeneratorArn *string - // License configuration type this generator reports on. + // License configuration type for this generator. ReportContext *ReportContext - // The AWS account ID used to create the report generator. + // The Amazon Web Services account ID used to create the report generator. ReportCreatorAccount *string - // Details on how frequently reports are generated. + // Details about how frequently reports are generated. ReportFrequency *ReportFrequency // Name of the report generator. diff --git a/service/licensemanager/validators.go b/service/licensemanager/validators.go index c4f7aacde09..349aa4e9172 100644 --- a/service/licensemanager/validators.go +++ b/service/licensemanager/validators.go @@ -150,6 +150,26 @@ func (m *validateOpCreateLicenseConfiguration) HandleInitialize(ctx context.Cont return next.HandleInitialize(ctx, in) } +type validateOpCreateLicenseConversionTaskForResource struct { +} + +func (*validateOpCreateLicenseConversionTaskForResource) ID() string { + return "OperationInputValidation" +} + +func (m *validateOpCreateLicenseConversionTaskForResource) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) ( + out middleware.InitializeOutput, metadata middleware.Metadata, err error, +) { + input, ok := in.Parameters.(*CreateLicenseConversionTaskForResourceInput) + if !ok { + return out, metadata, fmt.Errorf("unknown input parameters type %T", in.Parameters) + } + if err := validateOpCreateLicenseConversionTaskForResourceInput(input); err != nil { + return out, metadata, err + } + return next.HandleInitialize(ctx, in) +} + type validateOpCreateLicense struct { } @@ -410,6 +430,26 @@ func (m *validateOpGetLicenseConfiguration) HandleInitialize(ctx context.Context return next.HandleInitialize(ctx, in) } +type validateOpGetLicenseConversionTask struct { +} + +func (*validateOpGetLicenseConversionTask) ID() string { + return "OperationInputValidation" +} + +func (m *validateOpGetLicenseConversionTask) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) ( + out middleware.InitializeOutput, metadata middleware.Metadata, err error, +) { + input, ok := in.Parameters.(*GetLicenseConversionTaskInput) + if !ok { + return out, metadata, fmt.Errorf("unknown input parameters type %T", in.Parameters) + } + if err := validateOpGetLicenseConversionTaskInput(input); err != nil { + return out, metadata, err + } + return next.HandleInitialize(ctx, in) +} + type validateOpGetLicense struct { } @@ -778,6 +818,10 @@ func addOpCreateLicenseConfigurationValidationMiddleware(stack *middleware.Stack return stack.Initialize.Add(&validateOpCreateLicenseConfiguration{}, middleware.After) } +func addOpCreateLicenseConversionTaskForResourceValidationMiddleware(stack *middleware.Stack) error { + return stack.Initialize.Add(&validateOpCreateLicenseConversionTaskForResource{}, middleware.After) +} + func addOpCreateLicenseValidationMiddleware(stack *middleware.Stack) error { return stack.Initialize.Add(&validateOpCreateLicense{}, middleware.After) } @@ -830,6 +874,10 @@ func addOpGetLicenseConfigurationValidationMiddleware(stack *middleware.Stack) e return stack.Initialize.Add(&validateOpGetLicenseConfiguration{}, middleware.After) } +func addOpGetLicenseConversionTaskValidationMiddleware(stack *middleware.Stack) error { + return stack.Initialize.Add(&validateOpGetLicenseConversionTask{}, middleware.After) +} + func addOpGetLicenseValidationMiddleware(stack *middleware.Stack) error { return stack.Initialize.Add(&validateOpGetLicense{}, middleware.After) } @@ -1381,6 +1429,27 @@ func validateOpCreateLicenseConfigurationInput(v *CreateLicenseConfigurationInpu } } +func validateOpCreateLicenseConversionTaskForResourceInput(v *CreateLicenseConversionTaskForResourceInput) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "CreateLicenseConversionTaskForResourceInput"} + if v.ResourceArn == nil { + invalidParams.Add(smithy.NewErrParamRequired("ResourceArn")) + } + if v.SourceLicenseContext == nil { + invalidParams.Add(smithy.NewErrParamRequired("SourceLicenseContext")) + } + if v.DestinationLicenseContext == nil { + invalidParams.Add(smithy.NewErrParamRequired("DestinationLicenseContext")) + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + func validateOpCreateLicenseInput(v *CreateLicenseInput) error { if v == nil { return nil @@ -1687,6 +1756,21 @@ func validateOpGetLicenseConfigurationInput(v *GetLicenseConfigurationInput) err } } +func validateOpGetLicenseConversionTaskInput(v *GetLicenseConversionTaskInput) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "GetLicenseConversionTaskInput"} + if v.LicenseConversionTaskId == nil { + invalidParams.Add(smithy.NewErrParamRequired("LicenseConversionTaskId")) + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + func validateOpGetLicenseInput(v *GetLicenseInput) error { if v == nil { return nil diff --git a/service/mediaconvert/deserializers.go b/service/mediaconvert/deserializers.go index e1387a08d0b..0f5c75741e4 100644 --- a/service/mediaconvert/deserializers.go +++ b/service/mediaconvert/deserializers.go @@ -6828,6 +6828,15 @@ func awsRestjson1_deserializeDocumentBurninDestinationSettings(v **types.BurninD sv.Alignment = types.BurninSubtitleAlignment(jtv) } + case "applyFontColor": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected BurninSubtitleApplyFontColor to be of type string, got %T instead", value) + } + sv.ApplyFontColor = types.BurninSubtitleApplyFontColor(jtv) + } + case "backgroundColor": if value != nil { jtv, ok := value.(string) @@ -6850,6 +6859,15 @@ func awsRestjson1_deserializeDocumentBurninDestinationSettings(v **types.BurninD sv.BackgroundOpacity = int32(i64) } + case "fallbackFont": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected BurninSubtitleFallbackFont to be of type string, got %T instead", value) + } + sv.FallbackFont = types.BurninSubtitleFallbackFont(jtv) + } + case "fontColor": if value != nil { jtv, ok := value.(string) @@ -6907,6 +6925,15 @@ func awsRestjson1_deserializeDocumentBurninDestinationSettings(v **types.BurninD sv.FontSize = int32(i64) } + case "hexFontColor": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected __stringMin6Max8Pattern09aFAF609aFAF2 to be of type string, got %T instead", value) + } + sv.HexFontColor = ptr.String(jtv) + } + case "outlineColor": if value != nil { jtv, ok := value.(string) @@ -6977,6 +7004,15 @@ func awsRestjson1_deserializeDocumentBurninDestinationSettings(v **types.BurninD sv.ShadowYOffset = int32(i64) } + case "stylePassthrough": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected BurnInSubtitleStylePassthrough to be of type string, got %T instead", value) + } + sv.StylePassthrough = types.BurnInSubtitleStylePassthrough(jtv) + } + case "teletextSpacing": if value != nil { jtv, ok := value.(string) @@ -7680,6 +7716,11 @@ func awsRestjson1_deserializeDocumentCmafGroupSettings(v **types.CmafGroupSettin sv.ImageBasedTrickPlay = types.CmafImageBasedTrickPlay(jtv) } + case "imageBasedTrickPlaySettings": + if err := awsRestjson1_deserializeDocumentCmafImageBasedTrickPlaySettings(&sv.ImageBasedTrickPlaySettings, value); err != nil { + return err + } + case "manifestCompression": if value != nil { jtv, ok := value.(string) @@ -7848,6 +7889,132 @@ func awsRestjson1_deserializeDocumentCmafGroupSettings(v **types.CmafGroupSettin return nil } +func awsRestjson1_deserializeDocumentCmafImageBasedTrickPlaySettings(v **types.CmafImageBasedTrickPlaySettings, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.CmafImageBasedTrickPlaySettings + if *v == nil { + sv = &types.CmafImageBasedTrickPlaySettings{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "intervalCadence": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected CmafIntervalCadence to be of type string, got %T instead", value) + } + sv.IntervalCadence = types.CmafIntervalCadence(jtv) + } + + case "thumbnailHeight": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected __integerMin2Max4096 to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.ThumbnailHeight = int32(i64) + } + + case "thumbnailInterval": + if value != nil { + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.ThumbnailInterval = f64 + + case string: + var f64 float64 + switch { + case strings.EqualFold(jtv, "NaN"): + f64 = math.NaN() + + case strings.EqualFold(jtv, "Infinity"): + f64 = math.Inf(1) + + case strings.EqualFold(jtv, "-Infinity"): + f64 = math.Inf(-1) + + default: + return fmt.Errorf("unknown JSON number value: %s", jtv) + + } + sv.ThumbnailInterval = f64 + + default: + return fmt.Errorf("expected __doubleMin0Max2147483647 to be a JSON Number, got %T instead", value) + + } + } + + case "thumbnailWidth": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected __integerMin8Max4096 to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.ThumbnailWidth = int32(i64) + } + + case "tileHeight": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected __integerMin1Max2048 to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.TileHeight = int32(i64) + } + + case "tileWidth": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected __integerMin1Max512 to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.TileWidth = int32(i64) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsRestjson1_deserializeDocumentCmfcSettings(v **types.CmfcSettings, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -8362,6 +8529,11 @@ func awsRestjson1_deserializeDocumentDashIsoGroupSettings(v **types.DashIsoGroup sv.ImageBasedTrickPlay = types.DashIsoImageBasedTrickPlay(jtv) } + case "imageBasedTrickPlaySettings": + if err := awsRestjson1_deserializeDocumentDashIsoImageBasedTrickPlaySettings(&sv.ImageBasedTrickPlaySettings, value); err != nil { + return err + } + case "minBufferTime": if value != nil { jtv, ok := value.(json.Number) @@ -8476,6 +8648,132 @@ func awsRestjson1_deserializeDocumentDashIsoGroupSettings(v **types.DashIsoGroup return nil } +func awsRestjson1_deserializeDocumentDashIsoImageBasedTrickPlaySettings(v **types.DashIsoImageBasedTrickPlaySettings, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.DashIsoImageBasedTrickPlaySettings + if *v == nil { + sv = &types.DashIsoImageBasedTrickPlaySettings{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "intervalCadence": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected DashIsoIntervalCadence to be of type string, got %T instead", value) + } + sv.IntervalCadence = types.DashIsoIntervalCadence(jtv) + } + + case "thumbnailHeight": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected __integerMin1Max4096 to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.ThumbnailHeight = int32(i64) + } + + case "thumbnailInterval": + if value != nil { + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.ThumbnailInterval = f64 + + case string: + var f64 float64 + switch { + case strings.EqualFold(jtv, "NaN"): + f64 = math.NaN() + + case strings.EqualFold(jtv, "Infinity"): + f64 = math.Inf(1) + + case strings.EqualFold(jtv, "-Infinity"): + f64 = math.Inf(-1) + + default: + return fmt.Errorf("unknown JSON number value: %s", jtv) + + } + sv.ThumbnailInterval = f64 + + default: + return fmt.Errorf("expected __doubleMin0Max2147483647 to be a JSON Number, got %T instead", value) + + } + } + + case "thumbnailWidth": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected __integerMin8Max4096 to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.ThumbnailWidth = int32(i64) + } + + case "tileHeight": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected __integerMin1Max2048 to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.TileHeight = int32(i64) + } + + case "tileWidth": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected __integerMin1Max512 to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.TileWidth = int32(i64) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsRestjson1_deserializeDocumentDeinterlacer(v **types.Deinterlacer, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -8849,6 +9147,15 @@ func awsRestjson1_deserializeDocumentDvbSubDestinationSettings(v **types.DvbSubD sv.Alignment = types.DvbSubtitleAlignment(jtv) } + case "applyFontColor": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected DvbSubtitleApplyFontColor to be of type string, got %T instead", value) + } + sv.ApplyFontColor = types.DvbSubtitleApplyFontColor(jtv) + } + case "backgroundColor": if value != nil { jtv, ok := value.(string) @@ -8906,6 +9213,15 @@ func awsRestjson1_deserializeDocumentDvbSubDestinationSettings(v **types.DvbSubD sv.DdsYCoordinate = int32(i64) } + case "fallbackFont": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected DvbSubSubtitleFallbackFont to be of type string, got %T instead", value) + } + sv.FallbackFont = types.DvbSubSubtitleFallbackFont(jtv) + } + case "fontColor": if value != nil { jtv, ok := value.(string) @@ -8976,6 +9292,15 @@ func awsRestjson1_deserializeDocumentDvbSubDestinationSettings(v **types.DvbSubD sv.Height = int32(i64) } + case "hexFontColor": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected __stringMin6Max8Pattern09aFAF609aFAF2 to be of type string, got %T instead", value) + } + sv.HexFontColor = ptr.String(jtv) + } + case "outlineColor": if value != nil { jtv, ok := value.(string) @@ -9046,6 +9371,15 @@ func awsRestjson1_deserializeDocumentDvbSubDestinationSettings(v **types.DvbSubD sv.ShadowYOffset = int32(i64) } + case "stylePassthrough": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected DvbSubtitleStylePassthrough to be of type string, got %T instead", value) + } + sv.StylePassthrough = types.DvbSubtitleStylePassthrough(jtv) + } + case "subtitlingType": if value != nil { jtv, ok := value.(string) @@ -12137,6 +12471,11 @@ func awsRestjson1_deserializeDocumentHlsGroupSettings(v **types.HlsGroupSettings sv.ImageBasedTrickPlay = types.HlsImageBasedTrickPlay(jtv) } + case "imageBasedTrickPlaySettings": + if err := awsRestjson1_deserializeDocumentHlsImageBasedTrickPlaySettings(&sv.ImageBasedTrickPlaySettings, value); err != nil { + return err + } + case "manifestCompression": if value != nil { jtv, ok := value.(string) @@ -12339,6 +12678,132 @@ func awsRestjson1_deserializeDocumentHlsGroupSettings(v **types.HlsGroupSettings return nil } +func awsRestjson1_deserializeDocumentHlsImageBasedTrickPlaySettings(v **types.HlsImageBasedTrickPlaySettings, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.HlsImageBasedTrickPlaySettings + if *v == nil { + sv = &types.HlsImageBasedTrickPlaySettings{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "intervalCadence": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected HlsIntervalCadence to be of type string, got %T instead", value) + } + sv.IntervalCadence = types.HlsIntervalCadence(jtv) + } + + case "thumbnailHeight": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected __integerMin2Max4096 to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.ThumbnailHeight = int32(i64) + } + + case "thumbnailInterval": + if value != nil { + switch jtv := value.(type) { + case json.Number: + f64, err := jtv.Float64() + if err != nil { + return err + } + sv.ThumbnailInterval = f64 + + case string: + var f64 float64 + switch { + case strings.EqualFold(jtv, "NaN"): + f64 = math.NaN() + + case strings.EqualFold(jtv, "Infinity"): + f64 = math.Inf(1) + + case strings.EqualFold(jtv, "-Infinity"): + f64 = math.Inf(-1) + + default: + return fmt.Errorf("unknown JSON number value: %s", jtv) + + } + sv.ThumbnailInterval = f64 + + default: + return fmt.Errorf("expected __doubleMin0Max2147483647 to be a JSON Number, got %T instead", value) + + } + } + + case "thumbnailWidth": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected __integerMin8Max4096 to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.ThumbnailWidth = int32(i64) + } + + case "tileHeight": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected __integerMin1Max2048 to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.TileHeight = int32(i64) + } + + case "tileWidth": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected __integerMin1Max512 to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.TileWidth = int32(i64) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsRestjson1_deserializeDocumentHlsRenditionGroupSettings(v **types.HlsRenditionGroupSettings, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) diff --git a/service/mediaconvert/serializers.go b/service/mediaconvert/serializers.go index 304992963f6..a1ede8b00cd 100644 --- a/service/mediaconvert/serializers.go +++ b/service/mediaconvert/serializers.go @@ -3038,6 +3038,11 @@ func awsRestjson1_serializeDocumentBurninDestinationSettings(v *types.BurninDest ok.String(string(v.Alignment)) } + if len(v.ApplyFontColor) > 0 { + ok := object.Key("applyFontColor") + ok.String(string(v.ApplyFontColor)) + } + if len(v.BackgroundColor) > 0 { ok := object.Key("backgroundColor") ok.String(string(v.BackgroundColor)) @@ -3048,6 +3053,11 @@ func awsRestjson1_serializeDocumentBurninDestinationSettings(v *types.BurninDest ok.Integer(v.BackgroundOpacity) } + if len(v.FallbackFont) > 0 { + ok := object.Key("fallbackFont") + ok.String(string(v.FallbackFont)) + } + if len(v.FontColor) > 0 { ok := object.Key("fontColor") ok.String(string(v.FontColor)) @@ -3073,6 +3083,11 @@ func awsRestjson1_serializeDocumentBurninDestinationSettings(v *types.BurninDest ok.Integer(v.FontSize) } + if v.HexFontColor != nil { + ok := object.Key("hexFontColor") + ok.String(*v.HexFontColor) + } + if len(v.OutlineColor) > 0 { ok := object.Key("outlineColor") ok.String(string(v.OutlineColor)) @@ -3103,6 +3118,11 @@ func awsRestjson1_serializeDocumentBurninDestinationSettings(v *types.BurninDest ok.Integer(v.ShadowYOffset) } + if len(v.StylePassthrough) > 0 { + ok := object.Key("stylePassthrough") + ok.String(string(v.StylePassthrough)) + } + if len(v.TeletextSpacing) > 0 { ok := object.Key("teletextSpacing") ok.String(string(v.TeletextSpacing)) @@ -3490,6 +3510,13 @@ func awsRestjson1_serializeDocumentCmafGroupSettings(v *types.CmafGroupSettings, ok.String(string(v.ImageBasedTrickPlay)) } + if v.ImageBasedTrickPlaySettings != nil { + ok := object.Key("imageBasedTrickPlaySettings") + if err := awsRestjson1_serializeDocumentCmafImageBasedTrickPlaySettings(v.ImageBasedTrickPlaySettings, ok); err != nil { + return err + } + } + if len(v.ManifestCompression) > 0 { ok := object.Key("manifestCompression") ok.String(string(v.ManifestCompression)) @@ -3576,6 +3603,56 @@ func awsRestjson1_serializeDocumentCmafGroupSettings(v *types.CmafGroupSettings, return nil } +func awsRestjson1_serializeDocumentCmafImageBasedTrickPlaySettings(v *types.CmafImageBasedTrickPlaySettings, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if len(v.IntervalCadence) > 0 { + ok := object.Key("intervalCadence") + ok.String(string(v.IntervalCadence)) + } + + if v.ThumbnailHeight != 0 { + ok := object.Key("thumbnailHeight") + ok.Integer(v.ThumbnailHeight) + } + + if v.ThumbnailInterval != 0 { + ok := object.Key("thumbnailInterval") + switch { + case math.IsNaN(v.ThumbnailInterval): + ok.String("NaN") + + case math.IsInf(v.ThumbnailInterval, 1): + ok.String("Infinity") + + case math.IsInf(v.ThumbnailInterval, -1): + ok.String("-Infinity") + + default: + ok.Double(v.ThumbnailInterval) + + } + } + + if v.ThumbnailWidth != 0 { + ok := object.Key("thumbnailWidth") + ok.Integer(v.ThumbnailWidth) + } + + if v.TileHeight != 0 { + ok := object.Key("tileHeight") + ok.Integer(v.TileHeight) + } + + if v.TileWidth != 0 { + ok := object.Key("tileWidth") + ok.Integer(v.TileWidth) + } + + return nil +} + func awsRestjson1_serializeDocumentCmfcSettings(v *types.CmfcSettings, value smithyjson.Value) error { object := value.Object() defer object.Close() @@ -3828,6 +3905,13 @@ func awsRestjson1_serializeDocumentDashIsoGroupSettings(v *types.DashIsoGroupSet ok.String(string(v.ImageBasedTrickPlay)) } + if v.ImageBasedTrickPlaySettings != nil { + ok := object.Key("imageBasedTrickPlaySettings") + if err := awsRestjson1_serializeDocumentDashIsoImageBasedTrickPlaySettings(v.ImageBasedTrickPlaySettings, ok); err != nil { + return err + } + } + if v.MinBufferTime != 0 { ok := object.Key("minBufferTime") ok.Integer(v.MinBufferTime) @@ -3884,6 +3968,56 @@ func awsRestjson1_serializeDocumentDashIsoGroupSettings(v *types.DashIsoGroupSet return nil } +func awsRestjson1_serializeDocumentDashIsoImageBasedTrickPlaySettings(v *types.DashIsoImageBasedTrickPlaySettings, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if len(v.IntervalCadence) > 0 { + ok := object.Key("intervalCadence") + ok.String(string(v.IntervalCadence)) + } + + if v.ThumbnailHeight != 0 { + ok := object.Key("thumbnailHeight") + ok.Integer(v.ThumbnailHeight) + } + + if v.ThumbnailInterval != 0 { + ok := object.Key("thumbnailInterval") + switch { + case math.IsNaN(v.ThumbnailInterval): + ok.String("NaN") + + case math.IsInf(v.ThumbnailInterval, 1): + ok.String("Infinity") + + case math.IsInf(v.ThumbnailInterval, -1): + ok.String("-Infinity") + + default: + ok.Double(v.ThumbnailInterval) + + } + } + + if v.ThumbnailWidth != 0 { + ok := object.Key("thumbnailWidth") + ok.Integer(v.ThumbnailWidth) + } + + if v.TileHeight != 0 { + ok := object.Key("tileHeight") + ok.Integer(v.TileHeight) + } + + if v.TileWidth != 0 { + ok := object.Key("tileWidth") + ok.Integer(v.TileWidth) + } + + return nil +} + func awsRestjson1_serializeDocumentDeinterlacer(v *types.Deinterlacer, value smithyjson.Value) error { object := value.Object() defer object.Close() @@ -4019,6 +4153,11 @@ func awsRestjson1_serializeDocumentDvbSubDestinationSettings(v *types.DvbSubDest ok.String(string(v.Alignment)) } + if len(v.ApplyFontColor) > 0 { + ok := object.Key("applyFontColor") + ok.String(string(v.ApplyFontColor)) + } + if len(v.BackgroundColor) > 0 { ok := object.Key("backgroundColor") ok.String(string(v.BackgroundColor)) @@ -4044,6 +4183,11 @@ func awsRestjson1_serializeDocumentDvbSubDestinationSettings(v *types.DvbSubDest ok.Integer(v.DdsYCoordinate) } + if len(v.FallbackFont) > 0 { + ok := object.Key("fallbackFont") + ok.String(string(v.FallbackFont)) + } + if len(v.FontColor) > 0 { ok := object.Key("fontColor") ok.String(string(v.FontColor)) @@ -4074,6 +4218,11 @@ func awsRestjson1_serializeDocumentDvbSubDestinationSettings(v *types.DvbSubDest ok.Integer(v.Height) } + if v.HexFontColor != nil { + ok := object.Key("hexFontColor") + ok.String(*v.HexFontColor) + } + if len(v.OutlineColor) > 0 { ok := object.Key("outlineColor") ok.String(string(v.OutlineColor)) @@ -4104,6 +4253,11 @@ func awsRestjson1_serializeDocumentDvbSubDestinationSettings(v *types.DvbSubDest ok.Integer(v.ShadowYOffset) } + if len(v.StylePassthrough) > 0 { + ok := object.Key("stylePassthrough") + ok.String(string(v.StylePassthrough)) + } + if len(v.SubtitlingType) > 0 { ok := object.Key("subtitlingType") ok.String(string(v.SubtitlingType)) @@ -5431,6 +5585,13 @@ func awsRestjson1_serializeDocumentHlsGroupSettings(v *types.HlsGroupSettings, v ok.String(string(v.ImageBasedTrickPlay)) } + if v.ImageBasedTrickPlaySettings != nil { + ok := object.Key("imageBasedTrickPlaySettings") + if err := awsRestjson1_serializeDocumentHlsImageBasedTrickPlaySettings(v.ImageBasedTrickPlaySettings, ok); err != nil { + return err + } + } + if len(v.ManifestCompression) > 0 { ok := object.Key("manifestCompression") ok.String(string(v.ManifestCompression)) @@ -5527,6 +5688,56 @@ func awsRestjson1_serializeDocumentHlsGroupSettings(v *types.HlsGroupSettings, v return nil } +func awsRestjson1_serializeDocumentHlsImageBasedTrickPlaySettings(v *types.HlsImageBasedTrickPlaySettings, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if len(v.IntervalCadence) > 0 { + ok := object.Key("intervalCadence") + ok.String(string(v.IntervalCadence)) + } + + if v.ThumbnailHeight != 0 { + ok := object.Key("thumbnailHeight") + ok.Integer(v.ThumbnailHeight) + } + + if v.ThumbnailInterval != 0 { + ok := object.Key("thumbnailInterval") + switch { + case math.IsNaN(v.ThumbnailInterval): + ok.String("NaN") + + case math.IsInf(v.ThumbnailInterval, 1): + ok.String("Infinity") + + case math.IsInf(v.ThumbnailInterval, -1): + ok.String("-Infinity") + + default: + ok.Double(v.ThumbnailInterval) + + } + } + + if v.ThumbnailWidth != 0 { + ok := object.Key("thumbnailWidth") + ok.Integer(v.ThumbnailWidth) + } + + if v.TileHeight != 0 { + ok := object.Key("tileHeight") + ok.Integer(v.TileHeight) + } + + if v.TileWidth != 0 { + ok := object.Key("tileWidth") + ok.Integer(v.TileWidth) + } + + return nil +} + func awsRestjson1_serializeDocumentHlsRenditionGroupSettings(v *types.HlsRenditionGroupSettings, value smithyjson.Value) error { object := value.Object() defer object.Close() diff --git a/service/mediaconvert/types/enums.go b/service/mediaconvert/types/enums.go index b3b33f85c9a..1f336fc8a5f 100644 --- a/service/mediaconvert/types/enums.go +++ b/service/mediaconvert/types/enums.go @@ -957,6 +957,7 @@ type BurninSubtitleAlignment string const ( BurninSubtitleAlignmentCentered BurninSubtitleAlignment = "CENTERED" BurninSubtitleAlignmentLeft BurninSubtitleAlignment = "LEFT" + BurninSubtitleAlignmentAuto BurninSubtitleAlignment = "AUTO" ) // Values returns all known values for BurninSubtitleAlignment. Note that this can @@ -966,6 +967,25 @@ func (BurninSubtitleAlignment) Values() []BurninSubtitleAlignment { return []BurninSubtitleAlignment{ "CENTERED", "LEFT", + "AUTO", + } +} + +type BurninSubtitleApplyFontColor string + +// Enum values for BurninSubtitleApplyFontColor +const ( + BurninSubtitleApplyFontColorWhiteTextOnly BurninSubtitleApplyFontColor = "WHITE_TEXT_ONLY" + BurninSubtitleApplyFontColorAllText BurninSubtitleApplyFontColor = "ALL_TEXT" +) + +// Values returns all known values for BurninSubtitleApplyFontColor. 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 (BurninSubtitleApplyFontColor) Values() []BurninSubtitleApplyFontColor { + return []BurninSubtitleApplyFontColor{ + "WHITE_TEXT_ONLY", + "ALL_TEXT", } } @@ -976,6 +996,7 @@ const ( BurninSubtitleBackgroundColorNone BurninSubtitleBackgroundColor = "NONE" BurninSubtitleBackgroundColorBlack BurninSubtitleBackgroundColor = "BLACK" BurninSubtitleBackgroundColorWhite BurninSubtitleBackgroundColor = "WHITE" + BurninSubtitleBackgroundColorAuto BurninSubtitleBackgroundColor = "AUTO" ) // Values returns all known values for BurninSubtitleBackgroundColor. Note that @@ -987,6 +1008,31 @@ func (BurninSubtitleBackgroundColor) Values() []BurninSubtitleBackgroundColor { "NONE", "BLACK", "WHITE", + "AUTO", + } +} + +type BurninSubtitleFallbackFont string + +// Enum values for BurninSubtitleFallbackFont +const ( + BurninSubtitleFallbackFontBestMatch BurninSubtitleFallbackFont = "BEST_MATCH" + BurninSubtitleFallbackFontMonospacedSansserif BurninSubtitleFallbackFont = "MONOSPACED_SANSSERIF" + BurninSubtitleFallbackFontMonospacedSerif BurninSubtitleFallbackFont = "MONOSPACED_SERIF" + BurninSubtitleFallbackFontProportionalSansserif BurninSubtitleFallbackFont = "PROPORTIONAL_SANSSERIF" + BurninSubtitleFallbackFontProportionalSerif BurninSubtitleFallbackFont = "PROPORTIONAL_SERIF" +) + +// Values returns all known values for BurninSubtitleFallbackFont. 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 (BurninSubtitleFallbackFont) Values() []BurninSubtitleFallbackFont { + return []BurninSubtitleFallbackFont{ + "BEST_MATCH", + "MONOSPACED_SANSSERIF", + "MONOSPACED_SERIF", + "PROPORTIONAL_SANSSERIF", + "PROPORTIONAL_SERIF", } } @@ -1000,6 +1046,8 @@ const ( BurninSubtitleFontColorRed BurninSubtitleFontColor = "RED" BurninSubtitleFontColorGreen BurninSubtitleFontColor = "GREEN" BurninSubtitleFontColorBlue BurninSubtitleFontColor = "BLUE" + BurninSubtitleFontColorHex BurninSubtitleFontColor = "HEX" + BurninSubtitleFontColorAuto BurninSubtitleFontColor = "AUTO" ) // Values returns all known values for BurninSubtitleFontColor. Note that this can @@ -1013,6 +1061,8 @@ func (BurninSubtitleFontColor) Values() []BurninSubtitleFontColor { "RED", "GREEN", "BLUE", + "HEX", + "AUTO", } } @@ -1026,6 +1076,7 @@ const ( BurninSubtitleOutlineColorRed BurninSubtitleOutlineColor = "RED" BurninSubtitleOutlineColorGreen BurninSubtitleOutlineColor = "GREEN" BurninSubtitleOutlineColorBlue BurninSubtitleOutlineColor = "BLUE" + BurninSubtitleOutlineColorAuto BurninSubtitleOutlineColor = "AUTO" ) // Values returns all known values for BurninSubtitleOutlineColor. Note that this @@ -1039,6 +1090,7 @@ func (BurninSubtitleOutlineColor) Values() []BurninSubtitleOutlineColor { "RED", "GREEN", "BLUE", + "AUTO", } } @@ -1049,6 +1101,7 @@ const ( BurninSubtitleShadowColorNone BurninSubtitleShadowColor = "NONE" BurninSubtitleShadowColorBlack BurninSubtitleShadowColor = "BLACK" BurninSubtitleShadowColorWhite BurninSubtitleShadowColor = "WHITE" + BurninSubtitleShadowColorAuto BurninSubtitleShadowColor = "AUTO" ) // Values returns all known values for BurninSubtitleShadowColor. Note that this @@ -1059,6 +1112,26 @@ func (BurninSubtitleShadowColor) Values() []BurninSubtitleShadowColor { "NONE", "BLACK", "WHITE", + "AUTO", + } +} + +type BurnInSubtitleStylePassthrough string + +// Enum values for BurnInSubtitleStylePassthrough +const ( + BurnInSubtitleStylePassthroughEnabled BurnInSubtitleStylePassthrough = "ENABLED" + BurnInSubtitleStylePassthroughDisabled BurnInSubtitleStylePassthrough = "DISABLED" +) + +// Values returns all known values for BurnInSubtitleStylePassthrough. 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 (BurnInSubtitleStylePassthrough) Values() []BurnInSubtitleStylePassthrough { + return []BurnInSubtitleStylePassthrough{ + "ENABLED", + "DISABLED", } } @@ -1068,6 +1141,7 @@ type BurninSubtitleTeletextSpacing string const ( BurninSubtitleTeletextSpacingFixedGrid BurninSubtitleTeletextSpacing = "FIXED_GRID" BurninSubtitleTeletextSpacingProportional BurninSubtitleTeletextSpacing = "PROPORTIONAL" + BurninSubtitleTeletextSpacingAuto BurninSubtitleTeletextSpacing = "AUTO" ) // Values returns all known values for BurninSubtitleTeletextSpacing. Note that @@ -1078,6 +1152,7 @@ func (BurninSubtitleTeletextSpacing) Values() []BurninSubtitleTeletextSpacing { return []BurninSubtitleTeletextSpacing{ "FIXED_GRID", "PROPORTIONAL", + "AUTO", } } @@ -1222,6 +1297,7 @@ const ( CmafImageBasedTrickPlayNone CmafImageBasedTrickPlay = "NONE" CmafImageBasedTrickPlayThumbnail CmafImageBasedTrickPlay = "THUMBNAIL" CmafImageBasedTrickPlayThumbnailAndFullframe CmafImageBasedTrickPlay = "THUMBNAIL_AND_FULLFRAME" + CmafImageBasedTrickPlayAdvanced CmafImageBasedTrickPlay = "ADVANCED" ) // Values returns all known values for CmafImageBasedTrickPlay. Note that this can @@ -1232,6 +1308,7 @@ func (CmafImageBasedTrickPlay) Values() []CmafImageBasedTrickPlay { "NONE", "THUMBNAIL", "THUMBNAIL_AND_FULLFRAME", + "ADVANCED", } } @@ -1254,6 +1331,24 @@ func (CmafInitializationVectorInManifest) Values() []CmafInitializationVectorInM } } +type CmafIntervalCadence string + +// Enum values for CmafIntervalCadence +const ( + CmafIntervalCadenceFollowIframe CmafIntervalCadence = "FOLLOW_IFRAME" + CmafIntervalCadenceFollowCustom CmafIntervalCadence = "FOLLOW_CUSTOM" +) + +// Values returns all known values for CmafIntervalCadence. 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 (CmafIntervalCadence) Values() []CmafIntervalCadence { + return []CmafIntervalCadence{ + "FOLLOW_IFRAME", + "FOLLOW_CUSTOM", + } +} + type CmafKeyProviderType string // Enum values for CmafKeyProviderType @@ -1782,6 +1877,7 @@ const ( DashIsoImageBasedTrickPlayNone DashIsoImageBasedTrickPlay = "NONE" DashIsoImageBasedTrickPlayThumbnail DashIsoImageBasedTrickPlay = "THUMBNAIL" DashIsoImageBasedTrickPlayThumbnailAndFullframe DashIsoImageBasedTrickPlay = "THUMBNAIL_AND_FULLFRAME" + DashIsoImageBasedTrickPlayAdvanced DashIsoImageBasedTrickPlay = "ADVANCED" ) // Values returns all known values for DashIsoImageBasedTrickPlay. Note that this @@ -1792,6 +1888,25 @@ func (DashIsoImageBasedTrickPlay) Values() []DashIsoImageBasedTrickPlay { "NONE", "THUMBNAIL", "THUMBNAIL_AND_FULLFRAME", + "ADVANCED", + } +} + +type DashIsoIntervalCadence string + +// Enum values for DashIsoIntervalCadence +const ( + DashIsoIntervalCadenceFollowIframe DashIsoIntervalCadence = "FOLLOW_IFRAME" + DashIsoIntervalCadenceFollowCustom DashIsoIntervalCadence = "FOLLOW_CUSTOM" +) + +// Values returns all known values for DashIsoIntervalCadence. 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 (DashIsoIntervalCadence) Values() []DashIsoIntervalCadence { + return []DashIsoIntervalCadence{ + "FOLLOW_IFRAME", + "FOLLOW_CUSTOM", } } @@ -2078,12 +2193,37 @@ func (DvbddsHandling) Values() []DvbddsHandling { } } +type DvbSubSubtitleFallbackFont string + +// Enum values for DvbSubSubtitleFallbackFont +const ( + DvbSubSubtitleFallbackFontBestMatch DvbSubSubtitleFallbackFont = "BEST_MATCH" + DvbSubSubtitleFallbackFontMonospacedSansserif DvbSubSubtitleFallbackFont = "MONOSPACED_SANSSERIF" + DvbSubSubtitleFallbackFontMonospacedSerif DvbSubSubtitleFallbackFont = "MONOSPACED_SERIF" + DvbSubSubtitleFallbackFontProportionalSansserif DvbSubSubtitleFallbackFont = "PROPORTIONAL_SANSSERIF" + DvbSubSubtitleFallbackFontProportionalSerif DvbSubSubtitleFallbackFont = "PROPORTIONAL_SERIF" +) + +// Values returns all known values for DvbSubSubtitleFallbackFont. 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 (DvbSubSubtitleFallbackFont) Values() []DvbSubSubtitleFallbackFont { + return []DvbSubSubtitleFallbackFont{ + "BEST_MATCH", + "MONOSPACED_SANSSERIF", + "MONOSPACED_SERIF", + "PROPORTIONAL_SANSSERIF", + "PROPORTIONAL_SERIF", + } +} + type DvbSubtitleAlignment string // Enum values for DvbSubtitleAlignment const ( DvbSubtitleAlignmentCentered DvbSubtitleAlignment = "CENTERED" DvbSubtitleAlignmentLeft DvbSubtitleAlignment = "LEFT" + DvbSubtitleAlignmentAuto DvbSubtitleAlignment = "AUTO" ) // Values returns all known values for DvbSubtitleAlignment. Note that this can be @@ -2093,6 +2233,25 @@ func (DvbSubtitleAlignment) Values() []DvbSubtitleAlignment { return []DvbSubtitleAlignment{ "CENTERED", "LEFT", + "AUTO", + } +} + +type DvbSubtitleApplyFontColor string + +// Enum values for DvbSubtitleApplyFontColor +const ( + DvbSubtitleApplyFontColorWhiteTextOnly DvbSubtitleApplyFontColor = "WHITE_TEXT_ONLY" + DvbSubtitleApplyFontColorAllText DvbSubtitleApplyFontColor = "ALL_TEXT" +) + +// Values returns all known values for DvbSubtitleApplyFontColor. 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 (DvbSubtitleApplyFontColor) Values() []DvbSubtitleApplyFontColor { + return []DvbSubtitleApplyFontColor{ + "WHITE_TEXT_ONLY", + "ALL_TEXT", } } @@ -2103,6 +2262,7 @@ const ( DvbSubtitleBackgroundColorNone DvbSubtitleBackgroundColor = "NONE" DvbSubtitleBackgroundColorBlack DvbSubtitleBackgroundColor = "BLACK" DvbSubtitleBackgroundColorWhite DvbSubtitleBackgroundColor = "WHITE" + DvbSubtitleBackgroundColorAuto DvbSubtitleBackgroundColor = "AUTO" ) // Values returns all known values for DvbSubtitleBackgroundColor. Note that this @@ -2113,6 +2273,7 @@ func (DvbSubtitleBackgroundColor) Values() []DvbSubtitleBackgroundColor { "NONE", "BLACK", "WHITE", + "AUTO", } } @@ -2126,6 +2287,8 @@ const ( DvbSubtitleFontColorRed DvbSubtitleFontColor = "RED" DvbSubtitleFontColorGreen DvbSubtitleFontColor = "GREEN" DvbSubtitleFontColorBlue DvbSubtitleFontColor = "BLUE" + DvbSubtitleFontColorHex DvbSubtitleFontColor = "HEX" + DvbSubtitleFontColorAuto DvbSubtitleFontColor = "AUTO" ) // Values returns all known values for DvbSubtitleFontColor. Note that this can be @@ -2139,6 +2302,8 @@ func (DvbSubtitleFontColor) Values() []DvbSubtitleFontColor { "RED", "GREEN", "BLUE", + "HEX", + "AUTO", } } @@ -2152,6 +2317,7 @@ const ( DvbSubtitleOutlineColorRed DvbSubtitleOutlineColor = "RED" DvbSubtitleOutlineColorGreen DvbSubtitleOutlineColor = "GREEN" DvbSubtitleOutlineColorBlue DvbSubtitleOutlineColor = "BLUE" + DvbSubtitleOutlineColorAuto DvbSubtitleOutlineColor = "AUTO" ) // Values returns all known values for DvbSubtitleOutlineColor. Note that this can @@ -2165,6 +2331,7 @@ func (DvbSubtitleOutlineColor) Values() []DvbSubtitleOutlineColor { "RED", "GREEN", "BLUE", + "AUTO", } } @@ -2175,6 +2342,7 @@ const ( DvbSubtitleShadowColorNone DvbSubtitleShadowColor = "NONE" DvbSubtitleShadowColorBlack DvbSubtitleShadowColor = "BLACK" DvbSubtitleShadowColorWhite DvbSubtitleShadowColor = "WHITE" + DvbSubtitleShadowColorAuto DvbSubtitleShadowColor = "AUTO" ) // Values returns all known values for DvbSubtitleShadowColor. Note that this can @@ -2185,6 +2353,25 @@ func (DvbSubtitleShadowColor) Values() []DvbSubtitleShadowColor { "NONE", "BLACK", "WHITE", + "AUTO", + } +} + +type DvbSubtitleStylePassthrough string + +// Enum values for DvbSubtitleStylePassthrough +const ( + DvbSubtitleStylePassthroughEnabled DvbSubtitleStylePassthrough = "ENABLED" + DvbSubtitleStylePassthroughDisabled DvbSubtitleStylePassthrough = "DISABLED" +) + +// Values returns all known values for DvbSubtitleStylePassthrough. 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 (DvbSubtitleStylePassthrough) Values() []DvbSubtitleStylePassthrough { + return []DvbSubtitleStylePassthrough{ + "ENABLED", + "DISABLED", } } @@ -2194,6 +2381,7 @@ type DvbSubtitleTeletextSpacing string const ( DvbSubtitleTeletextSpacingFixedGrid DvbSubtitleTeletextSpacing = "FIXED_GRID" DvbSubtitleTeletextSpacingProportional DvbSubtitleTeletextSpacing = "PROPORTIONAL" + DvbSubtitleTeletextSpacingAuto DvbSubtitleTeletextSpacing = "AUTO" ) // Values returns all known values for DvbSubtitleTeletextSpacing. Note that this @@ -2203,6 +2391,7 @@ func (DvbSubtitleTeletextSpacing) Values() []DvbSubtitleTeletextSpacing { return []DvbSubtitleTeletextSpacing{ "FIXED_GRID", "PROPORTIONAL", + "AUTO", } } @@ -4047,6 +4236,7 @@ const ( HlsImageBasedTrickPlayNone HlsImageBasedTrickPlay = "NONE" HlsImageBasedTrickPlayThumbnail HlsImageBasedTrickPlay = "THUMBNAIL" HlsImageBasedTrickPlayThumbnailAndFullframe HlsImageBasedTrickPlay = "THUMBNAIL_AND_FULLFRAME" + HlsImageBasedTrickPlayAdvanced HlsImageBasedTrickPlay = "ADVANCED" ) // Values returns all known values for HlsImageBasedTrickPlay. Note that this can @@ -4057,6 +4247,7 @@ func (HlsImageBasedTrickPlay) Values() []HlsImageBasedTrickPlay { "NONE", "THUMBNAIL", "THUMBNAIL_AND_FULLFRAME", + "ADVANCED", } } @@ -4079,6 +4270,24 @@ func (HlsInitializationVectorInManifest) Values() []HlsInitializationVectorInMan } } +type HlsIntervalCadence string + +// Enum values for HlsIntervalCadence +const ( + HlsIntervalCadenceFollowIframe HlsIntervalCadence = "FOLLOW_IFRAME" + HlsIntervalCadenceFollowCustom HlsIntervalCadence = "FOLLOW_CUSTOM" +) + +// Values returns all known values for HlsIntervalCadence. 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 (HlsIntervalCadence) Values() []HlsIntervalCadence { + return []HlsIntervalCadence{ + "FOLLOW_IFRAME", + "FOLLOW_CUSTOM", + } +} + type HlsKeyProviderType string // Enum values for HlsKeyProviderType diff --git a/service/mediaconvert/types/types.go b/service/mediaconvert/types/types.go index 6b1e383ccfa..bdc3e70feb9 100644 --- a/service/mediaconvert/types/types.go +++ b/service/mediaconvert/types/types.go @@ -801,6 +801,16 @@ type BurninDestinationSettings struct { // All burn-in and DVB-Sub font settings must match. Alignment BurninSubtitleAlignment + // Ignore this setting unless your input captions are STL, any type of 608, + // teletext, or TTML, and your output captions are burned in. Specify how the + // service applies the color specified in the setting Font color + // (BurninSubtitleFontColor). By default, this color is white. When you choose + // WHITE_TEXT_ONLY, the service uses the specified font color only for text that is + // white in the input. When you choose ALL_TEXT, the service uses the specified + // font color for all output captions text. If you leave both settings at their + // default value, your output font color is the same as your input font color. + ApplyFontColor BurninSubtitleApplyFontColor + // Specifies the color of the rectangle behind the captions. All burn-in and // DVB-Sub font settings must match. BackgroundColor BurninSubtitleBackgroundColor @@ -810,6 +820,16 @@ type BurninDestinationSettings struct { // (transparent). All burn-in and DVB-Sub font settings must match. BackgroundOpacity int32 + // Specify the font that you want the service to use for your burn in captions when + // your input captions specify a font that MediaConvert doesn't support. When you + // keep the default value, Best match (BEST_MATCH), MediaConvert uses a supported + // font that most closely matches the font that your input captions specify. When + // there are multiple unsupported fonts in your input captions, MediaConvert + // matches each font with the supported font that matches best. When you explicitly + // choose a replacement font, MediaConvert uses that font to replace all + // unsupported fonts from your input. + FallbackFont BurninSubtitleFallbackFont + // Specifies the color of the burned-in captions. This option is not valid for // source captions that are STL, 608/embedded or teletext. These source settings // are already pre-defined by the caption stream. All burn-in and DVB-Sub font @@ -834,6 +854,13 @@ type BurninDestinationSettings struct { // automatic font size selection. All burn-in and DVB-Sub font settings must match. FontSize int32 + // Ignore this setting unless your BurninSubtitleFontColor setting is HEX. Format + // is six or eight hexidecimal digits, representing the red, green, and blue + // components, with the two extra digits used for an optional alpha value. For + // example a value of 1122AABB is a red value of 0x11, a green value of 0x22, a + // blue value of 0xAA, and an alpha value of 0xBB. + HexFontColor *string + // Specifies font outline color. This option is not valid for source captions that // are either 608/embedded or teletext. These source settings are already // pre-defined by the caption stream. All burn-in and DVB-Sub font settings must @@ -865,6 +892,15 @@ type BurninDestinationSettings struct { // burn-in and DVB-Sub font settings must match. ShadowYOffset int32 + // Ignore this setting unless your output captions are burned in. Choose which set + // of style and position values the service applies to your output captions. When + // you choose ENABLED, the service uses the input style and position information + // from your input. When you choose DISABLED, the service uses any style values + // that you specify in your output settings. If you don't specify values, the + // service uses default style and position values. When you choose DISABLED, the + // service ignores all style and position values from your input. + StylePassthrough BurnInSubtitleStylePassthrough + // Only applies to jobs with input captions in Teletext or STL formats. Specify // whether the spacing between letters in your captions is set by the captions grid // or varies depending on letter width. Choose fixed grid to conform to the spacing @@ -1298,6 +1334,9 @@ type CmafGroupSettings struct { // https://developer.roku.com/docs/developer-program/media-playback/trick-mode/hls-and-dash.md ImageBasedTrickPlay CmafImageBasedTrickPlay + // Tile and thumbnail settings applicable when imageBasedTrickPlay is ADVANCED + ImageBasedTrickPlaySettings *CmafImageBasedTrickPlaySettings + // When set to GZIP, compresses HLS playlist. ManifestCompression CmafManifestCompression @@ -1395,6 +1434,42 @@ type CmafGroupSettings struct { noSmithyDocumentSerde } +// Tile and thumbnail settings applicable when imageBasedTrickPlay is ADVANCED +type CmafImageBasedTrickPlaySettings struct { + + // The cadence MediaConvert follows for generating thumbnails. If set to + // FOLLOW_IFRAME, MediaConvert generates thumbnails for each IDR frame in the + // output (matching the GOP cadence). If set to FOLLOW_CUSTOM, MediaConvert + // generates thumbnails according to the interval you specify in thumbnailInterval. + IntervalCadence CmafIntervalCadence + + // Height of each thumbnail within each tile image, in pixels. Leave blank to + // maintain aspect ratio with thumbnail width. If following the aspect ratio would + // lead to a total tile height greater than 4096, then the job will be rejected. + // Must be divisible by 2. + ThumbnailHeight int32 + + // Enter the interval, in seconds, that MediaConvert uses to generate thumbnails. + // If the interval you enter doesn't align with the output frame rate, MediaConvert + // automatically rounds the interval to align with the output frame rate. For + // example, if the output frame rate is 29.97 frames per second and you enter 5, + // MediaConvert uses a 150 frame interval to generate thumbnails. + ThumbnailInterval float64 + + // Width of each thumbnail within each tile image, in pixels. Default is 312. Must + // be divisible by 8. + ThumbnailWidth int32 + + // Number of thumbnails in each column of a tile image. Set a value between 2 and + // 2048. Must be divisible by 2. + TileHeight int32 + + // Number of thumbnails in each row of a tile image. Set a value between 1 and 512. + TileWidth int32 + + noSmithyDocumentSerde +} + // These settings relate to the fragmented MP4 container for the segments in your // CMAF outputs. type CmfcSettings struct { @@ -1696,6 +1771,9 @@ type DashIsoGroupSettings struct { // https://developer.roku.com/docs/developer-program/media-playback/trick-mode/hls-and-dash.md ImageBasedTrickPlay DashIsoImageBasedTrickPlay + // Tile and thumbnail settings applicable when imageBasedTrickPlay is ADVANCED + ImageBasedTrickPlaySettings *DashIsoImageBasedTrickPlaySettings + // Minimum time of initially buffered media that is needed to ensure smooth // playout. MinBufferTime int32 @@ -1764,6 +1842,42 @@ type DashIsoGroupSettings struct { noSmithyDocumentSerde } +// Tile and thumbnail settings applicable when imageBasedTrickPlay is ADVANCED +type DashIsoImageBasedTrickPlaySettings struct { + + // The cadence MediaConvert follows for generating thumbnails. If set to + // FOLLOW_IFRAME, MediaConvert generates thumbnails for each IDR frame in the + // output (matching the GOP cadence). If set to FOLLOW_CUSTOM, MediaConvert + // generates thumbnails according to the interval you specify in thumbnailInterval. + IntervalCadence DashIsoIntervalCadence + + // Height of each thumbnail within each tile image, in pixels. Leave blank to + // maintain aspect ratio with thumbnail width. If following the aspect ratio would + // lead to a total tile height greater than 4096, then the job will be rejected. + // Must be divisible by 2. + ThumbnailHeight int32 + + // Enter the interval, in seconds, that MediaConvert uses to generate thumbnails. + // If the interval you enter doesn't align with the output frame rate, MediaConvert + // automatically rounds the interval to align with the output frame rate. For + // example, if the output frame rate is 29.97 frames per second and you enter 5, + // MediaConvert uses a 150 frame interval to generate thumbnails. + ThumbnailInterval float64 + + // Width of each thumbnail within each tile image, in pixels. Default is 312. Must + // be divisible by 8. + ThumbnailWidth int32 + + // Number of thumbnails in each column of a tile image. Set a value between 2 and + // 2048. Must be divisible by 2. + TileHeight int32 + + // Number of thumbnails in each row of a tile image. Set a value between 1 and 512. + TileWidth int32 + + noSmithyDocumentSerde +} + // Settings for deinterlacer type Deinterlacer struct { @@ -1905,6 +2019,16 @@ type DvbSubDestinationSettings struct { // All burn-in and DVB-Sub font settings must match. Alignment DvbSubtitleAlignment + // Ignore this setting unless your input captions are STL, any type of 608, + // teletext, or TTML, and your output captions are DVB-SUB. Specify how the service + // applies the color specified in the setting Font color (DvbSubtitleFontColor). By + // default, this color is white. When you choose WHITE_TEXT_ONLY, the service uses + // the specified font color only for text that is white in the input. When you + // choose ALL_TEXT, the service uses the specified font color for all output + // captions text. If you leave both settings at their default value, your output + // font color is the same as your input font color. + ApplyFontColor DvbSubtitleApplyFontColor + // Specifies the color of the rectangle behind the captions. All burn-in and // DVB-Sub font settings must match. BackgroundColor DvbSubtitleBackgroundColor @@ -1951,6 +2075,16 @@ type DvbSubDestinationSettings struct { // and DVB-Sub font settings must match. DdsYCoordinate int32 + // Specify the font that you want the service to use for your burn in captions when + // your input captions specify a font that MediaConvert doesn't support. When you + // keep the default value, Best match (BEST_MATCH), MediaConvert uses a supported + // font that most closely matches the font that your input captions specify. When + // there are multiple unsupported fonts in your input captions, MediaConvert + // matches each font with the supported font that matches best. When you explicitly + // choose a replacement font, MediaConvert uses that font to replace all + // unsupported fonts from your input. + FallbackFont DvbSubSubtitleFallbackFont + // Specifies the color of the DVB-SUB captions. This option is not valid for source // captions that are STL, 608/embedded or teletext. These source settings are // already pre-defined by the caption stream. All burn-in and DVB-Sub font settings @@ -1981,6 +2115,13 @@ type DvbSubDestinationSettings struct { // DVB-Sub font settings must match. Height int32 + // Ignore this setting unless your DvbSubtitleFontColor setting is HEX. Format is + // six or eight hexidecimal digits, representing the red, green, and blue + // components, with the two extra digits used for an optional alpha value. For + // example a value of 1122AABB is a red value of 0x11, a green value of 0x22, a + // blue value of 0xAA, and an alpha value of 0xBB. + HexFontColor *string + // Specifies font outline color. This option is not valid for source captions that // are either 608/embedded or teletext. These source settings are already // pre-defined by the caption stream. All burn-in and DVB-Sub font settings must @@ -2012,6 +2153,14 @@ type DvbSubDestinationSettings struct { // burn-in and DVB-Sub font settings must match. ShadowYOffset int32 + // Choose which set of style and position values the service applies to your output + // captions. When you choose ENABLED, the service uses the input style and position + // information from your input. When you choose DISABLED, the service uses any + // style values that you specify in your output settings. If you don't specify + // values, the service uses default style and position values. When you choose + // DISABLED, the service ignores all style and position values from your input. + StylePassthrough DvbSubtitleStylePassthrough + // Specify whether your DVB subtitles are standard or for hearing impaired. Choose // hearing impaired if your subtitles include audio descriptions and dialogue. // Choose standard if your subtitles include only dialogue. @@ -2458,7 +2607,10 @@ type EsamSignalProcessingNotification struct { noSmithyDocumentSerde } -// Hexadecimal value as per EIA-608 Line 21 Data Services, section 9.5.1.5 05h +// If your source content has EIA-608 Line 21 Data Services, enable this feature to +// specify what MediaConvert does with the Extended Data Services (XDS) packets. +// You can choose to pass through XDS packets, or remove them from the output. For +// more information about XDS, see EIA-608 Line Data Services, section 9.5.1.5 05h // Content Advisory. type ExtendedDataServices struct { @@ -3494,6 +3646,9 @@ type HlsGroupSettings struct { // https://developer.roku.com/docs/developer-program/media-playback/trick-mode/hls-and-dash.md ImageBasedTrickPlay HlsImageBasedTrickPlay + // Tile and thumbnail settings applicable when imageBasedTrickPlay is ADVANCED + ImageBasedTrickPlaySettings *HlsImageBasedTrickPlaySettings + // When set to GZIP, compresses HLS playlist. ManifestCompression HlsManifestCompression @@ -3581,6 +3736,42 @@ type HlsGroupSettings struct { noSmithyDocumentSerde } +// Tile and thumbnail settings applicable when imageBasedTrickPlay is ADVANCED +type HlsImageBasedTrickPlaySettings struct { + + // The cadence MediaConvert follows for generating thumbnails. If set to + // FOLLOW_IFRAME, MediaConvert generates thumbnails for each IDR frame in the + // output (matching the GOP cadence). If set to FOLLOW_CUSTOM, MediaConvert + // generates thumbnails according to the interval you specify in thumbnailInterval. + IntervalCadence HlsIntervalCadence + + // Height of each thumbnail within each tile image, in pixels. Leave blank to + // maintain aspect ratio with thumbnail width. If following the aspect ratio would + // lead to a total tile height greater than 4096, then the job will be rejected. + // Must be divisible by 2. + ThumbnailHeight int32 + + // Enter the interval, in seconds, that MediaConvert uses to generate thumbnails. + // If the interval you enter doesn't align with the output frame rate, MediaConvert + // automatically rounds the interval to align with the output frame rate. For + // example, if the output frame rate is 29.97 frames per second and you enter 5, + // MediaConvert uses a 150 frame interval to generate thumbnails. + ThumbnailInterval float64 + + // Width of each thumbnail within each tile image, in pixels. Default is 312. Must + // be divisible by 8. + ThumbnailWidth int32 + + // Number of thumbnails in each column of a tile image. Set a value between 2 and + // 2048. Must be divisible by 2. + TileHeight int32 + + // Number of thumbnails in each row of a tile image. Set a value between 1 and 512. + TileWidth int32 + + noSmithyDocumentSerde +} + // Settings specific to audio sources in an HLS alternate rendition group. Specify // the properties (renditionGroupId, renditionName or renditionLanguageCode) to // identify the unique audio track among the alternative rendition groups present @@ -4263,7 +4454,10 @@ type JobSettings struct { // you can ignore these settings. Esam *EsamSettings - // Hexadecimal value as per EIA-608 Line 21 Data Services, section 9.5.1.5 05h + // If your source content has EIA-608 Line 21 Data Services, enable this feature to + // specify what MediaConvert does with the Extended Data Services (XDS) packets. + // You can choose to pass through XDS packets, or remove them from the output. For + // more information about XDS, see EIA-608 Line Data Services, section 9.5.1.5 05h // Content Advisory. ExtendedDataServices *ExtendedDataServices @@ -4403,7 +4597,10 @@ type JobTemplateSettings struct { // you can ignore these settings. Esam *EsamSettings - // Hexadecimal value as per EIA-608 Line 21 Data Services, section 9.5.1.5 05h + // If your source content has EIA-608 Line 21 Data Services, enable this feature to + // specify what MediaConvert does with the Extended Data Services (XDS) packets. + // You can choose to pass through XDS packets, or remove them from the output. For + // more information about XDS, see EIA-608 Line Data Services, section 9.5.1.5 05h // Content Advisory. ExtendedDataServices *ExtendedDataServices diff --git a/service/mediapackagevod/deserializers.go b/service/mediapackagevod/deserializers.go index 55074d56f59..0429b748490 100644 --- a/service/mediapackagevod/deserializers.go +++ b/service/mediapackagevod/deserializers.go @@ -3894,6 +3894,15 @@ func awsRestjson1_deserializeDocumentEgressEndpoint(v **types.EgressEndpoint, va sv.PackagingConfigurationId = ptr.String(jtv) } + case "status": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected __string to be of type string, got %T instead", value) + } + sv.Status = ptr.String(jtv) + } + case "url": if value != nil { jtv, ok := value.(string) diff --git a/service/mediapackagevod/types/types.go b/service/mediapackagevod/types/types.go index c8de95d8a8f..3b34e6430cd 100644 --- a/service/mediapackagevod/types/types.go +++ b/service/mediapackagevod/types/types.go @@ -189,6 +189,11 @@ type EgressEndpoint struct { // The ID of the PackagingConfiguration being applied to the Asset. PackagingConfigurationId *string + // The current processing status of the asset used for the packaging configuration. + // The status can be either QUEUED, PROCESSING, PLAYABLE, or FAILED. Status + // information won't be available for most assets ingested before 2021-09-30. + Status *string + // The URL of the parent manifest for the repackaged Asset. Url *string diff --git a/service/mediatailor/api_op_ConfigureLogsForPlaybackConfiguration.go b/service/mediatailor/api_op_ConfigureLogsForPlaybackConfiguration.go new file mode 100644 index 00000000000..925ccb665be --- /dev/null +++ b/service/mediatailor/api_op_ConfigureLogsForPlaybackConfiguration.go @@ -0,0 +1,137 @@ +// Code generated by smithy-go-codegen DO NOT EDIT. + +package mediatailor + +import ( + "context" + awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" + "github.com/aws/aws-sdk-go-v2/aws/signer/v4" + "github.com/aws/smithy-go/middleware" + smithyhttp "github.com/aws/smithy-go/transport/http" +) + +// Configures Amazon CloudWatch log settings for a playback configuration. +func (c *Client) ConfigureLogsForPlaybackConfiguration(ctx context.Context, params *ConfigureLogsForPlaybackConfigurationInput, optFns ...func(*Options)) (*ConfigureLogsForPlaybackConfigurationOutput, error) { + if params == nil { + params = &ConfigureLogsForPlaybackConfigurationInput{} + } + + result, metadata, err := c.invokeOperation(ctx, "ConfigureLogsForPlaybackConfiguration", params, optFns, c.addOperationConfigureLogsForPlaybackConfigurationMiddlewares) + if err != nil { + return nil, err + } + + out := result.(*ConfigureLogsForPlaybackConfigurationOutput) + out.ResultMetadata = metadata + return out, nil +} + +// Configures Amazon CloudWatch log settings for a playback configuration. +type ConfigureLogsForPlaybackConfigurationInput struct { + + // The percentage of session logs that MediaTailor sends to your Cloudwatch Logs + // account. For example, if your playback configuration has 1000 sessions and + // percentEnabled is set to 60, MediaTailor sends logs for 600 of the sessions to + // CloudWatch Logs. MediaTailor decides at random which of the playback + // configuration sessions to send logs for. If you want to view logs for a specific + // session, you can use the debug log mode + // (https://docs.aws.amazon.com/mediatailor/latest/ug/debug-log-mode.html). Valid + // values: 0 - 100 + // + // This member is required. + PercentEnabled int32 + + // The name of the playback configuration. + // + // This member is required. + PlaybackConfigurationName *string + + noSmithyDocumentSerde +} + +type ConfigureLogsForPlaybackConfigurationOutput struct { + + // The percentage of session logs that MediaTailor sends to your Cloudwatch Logs + // account. + PercentEnabled int32 + + // The name of the playback configuration. + PlaybackConfigurationName *string + + // Metadata pertaining to the operation's result. + ResultMetadata middleware.Metadata + + noSmithyDocumentSerde +} + +func (c *Client) addOperationConfigureLogsForPlaybackConfigurationMiddlewares(stack *middleware.Stack, options Options) (err error) { + err = stack.Serialize.Add(&awsRestjson1_serializeOpConfigureLogsForPlaybackConfiguration{}, middleware.After) + if err != nil { + return err + } + err = stack.Deserialize.Add(&awsRestjson1_deserializeOpConfigureLogsForPlaybackConfiguration{}, middleware.After) + if err != nil { + return err + } + if err = addSetLoggerMiddleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddClientRequestIDMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddComputeContentLengthMiddleware(stack); err != nil { + return err + } + if err = addResolveEndpointMiddleware(stack, options); err != nil { + return err + } + if err = v4.AddComputePayloadSHA256Middleware(stack); err != nil { + return err + } + if err = addRetryMiddlewares(stack, options); err != nil { + return err + } + if err = addHTTPSignerV4Middleware(stack, options); err != nil { + return err + } + if err = awsmiddleware.AddRawResponseToMetadata(stack); err != nil { + return err + } + if err = awsmiddleware.AddRecordResponseTiming(stack); err != nil { + return err + } + if err = addClientUserAgent(stack); err != nil { + return err + } + if err = smithyhttp.AddErrorCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = smithyhttp.AddCloseResponseBodyMiddleware(stack); err != nil { + return err + } + if err = addOpConfigureLogsForPlaybackConfigurationValidationMiddleware(stack); err != nil { + return err + } + if err = stack.Initialize.Add(newServiceMetadataMiddleware_opConfigureLogsForPlaybackConfiguration(options.Region), middleware.Before); err != nil { + return err + } + if err = addRequestIDRetrieverMiddleware(stack); err != nil { + return err + } + if err = addResponseErrorMiddleware(stack); err != nil { + return err + } + if err = addRequestResponseLogging(stack, options); err != nil { + return err + } + return nil +} + +func newServiceMetadataMiddleware_opConfigureLogsForPlaybackConfiguration(region string) *awsmiddleware.RegisterServiceMetadata { + return &awsmiddleware.RegisterServiceMetadata{ + Region: region, + ServiceID: ServiceID, + SigningName: "mediatailor", + OperationName: "ConfigureLogsForPlaybackConfiguration", + } +} diff --git a/service/mediatailor/api_op_CreateChannel.go b/service/mediatailor/api_op_CreateChannel.go index 92fdc0087b2..89049e53551 100644 --- a/service/mediatailor/api_op_CreateChannel.go +++ b/service/mediatailor/api_op_CreateChannel.go @@ -50,7 +50,7 @@ type CreateChannelInput struct { PlaybackMode types.PlaybackMode // The slate used to fill gaps between programs in the schedule. You must configure - // filler slate if your channel uses an LINEAR PlaybackMode. + // filler slate if your channel uses a LINEAR PlaybackMode. FillerSlate *types.SlateSource // The tags to assign to the channel. diff --git a/service/mediatailor/api_op_GetPlaybackConfiguration.go b/service/mediatailor/api_op_GetPlaybackConfiguration.go index 478da7f84fb..8ccf3c8dde4 100644 --- a/service/mediatailor/api_op_GetPlaybackConfiguration.go +++ b/service/mediatailor/api_op_GetPlaybackConfiguration.go @@ -74,6 +74,9 @@ type GetPlaybackConfigurationOutput struct { // The configuration for pre-roll ad insertion. LivePreRollConfiguration *types.LivePreRollConfiguration + // The Amazon CloudWatch log settings for a playback configuration. + LogConfiguration *types.LogConfiguration + // The configuration for manifest processing rules. Manifest processing rules // enable customization of the personalized manifests created by MediaTailor. ManifestProcessingRules *types.ManifestProcessingRules diff --git a/service/mediatailor/api_op_PutPlaybackConfiguration.go b/service/mediatailor/api_op_PutPlaybackConfiguration.go index 85015a8cb10..00cb8b5d5fe 100644 --- a/service/mediatailor/api_op_PutPlaybackConfiguration.go +++ b/service/mediatailor/api_op_PutPlaybackConfiguration.go @@ -139,6 +139,9 @@ type PutPlaybackConfigurationOutput struct { // The configuration for pre-roll ad insertion. LivePreRollConfiguration *types.LivePreRollConfiguration + // The Amazon CloudWatch log settings for a playback configuration. + LogConfiguration *types.LogConfiguration + // The configuration for manifest processing rules. Manifest processing rules // enable customization of the personalized manifests created by MediaTailor. ManifestProcessingRules *types.ManifestProcessingRules diff --git a/service/mediatailor/deserializers.go b/service/mediatailor/deserializers.go index 9cdaf2730cf..475b753bf9e 100644 --- a/service/mediatailor/deserializers.go +++ b/service/mediatailor/deserializers.go @@ -20,6 +20,167 @@ import ( "strings" ) +type awsRestjson1_deserializeOpConfigureLogsForPlaybackConfiguration struct { +} + +func (*awsRestjson1_deserializeOpConfigureLogsForPlaybackConfiguration) ID() string { + return "OperationDeserializer" +} + +func (m *awsRestjson1_deserializeOpConfigureLogsForPlaybackConfiguration) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) ( + out middleware.DeserializeOutput, metadata middleware.Metadata, err error, +) { + out, metadata, err = next.HandleDeserialize(ctx, in) + if err != nil { + return out, metadata, err + } + + response, ok := out.RawResponse.(*smithyhttp.Response) + if !ok { + return out, metadata, &smithy.DeserializationError{Err: fmt.Errorf("unknown transport type %T", out.RawResponse)} + } + + if response.StatusCode < 200 || response.StatusCode >= 300 { + return out, metadata, awsRestjson1_deserializeOpErrorConfigureLogsForPlaybackConfiguration(response, &metadata) + } + output := &ConfigureLogsForPlaybackConfigurationOutput{} + out.Result = output + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(response.Body, ringBuffer) + + decoder := json.NewDecoder(body) + decoder.UseNumber() + var shape interface{} + if err := decoder.Decode(&shape); err != nil && err != io.EOF { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return out, metadata, err + } + + err = awsRestjson1_deserializeOpDocumentConfigureLogsForPlaybackConfigurationOutput(&output, shape) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + return out, metadata, &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body with invalid JSON, %w", err), + Snapshot: snapshot.Bytes(), + } + } + + return out, metadata, err +} + +func awsRestjson1_deserializeOpErrorConfigureLogsForPlaybackConfiguration(response *smithyhttp.Response, metadata *middleware.Metadata) error { + var errorBuffer bytes.Buffer + if _, err := io.Copy(&errorBuffer, response.Body); err != nil { + return &smithy.DeserializationError{Err: fmt.Errorf("failed to copy error response body, %w", err)} + } + errorBody := bytes.NewReader(errorBuffer.Bytes()) + + errorCode := "UnknownError" + errorMessage := errorCode + + code := response.Header.Get("X-Amzn-ErrorType") + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + + var buff [1024]byte + ringBuffer := smithyio.NewRingBuffer(buff[:]) + + body := io.TeeReader(errorBody, ringBuffer) + decoder := json.NewDecoder(body) + decoder.UseNumber() + code, message, err := restjson.GetErrorInfo(decoder) + if err != nil { + var snapshot bytes.Buffer + io.Copy(&snapshot, ringBuffer) + err = &smithy.DeserializationError{ + Err: fmt.Errorf("failed to decode response body, %w", err), + Snapshot: snapshot.Bytes(), + } + return err + } + + errorBody.Seek(0, io.SeekStart) + if len(code) != 0 { + errorCode = restjson.SanitizeErrorCode(code) + } + if len(message) != 0 { + errorMessage = message + } + + switch { + default: + genericError := &smithy.GenericAPIError{ + Code: errorCode, + Message: errorMessage, + } + return genericError + + } +} + +func awsRestjson1_deserializeOpDocumentConfigureLogsForPlaybackConfigurationOutput(v **ConfigureLogsForPlaybackConfigurationOutput, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *ConfigureLogsForPlaybackConfigurationOutput + if *v == nil { + sv = &ConfigureLogsForPlaybackConfigurationOutput{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "PercentEnabled": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected __integer to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.PercentEnabled = int32(i64) + } + + case "PlaybackConfigurationName": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected __string to be of type string, got %T instead", value) + } + sv.PlaybackConfigurationName = ptr.String(jtv) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + type awsRestjson1_deserializeOpCreateChannel struct { } @@ -2695,6 +2856,11 @@ func awsRestjson1_deserializeOpDocumentGetPlaybackConfigurationOutput(v **GetPla return err } + case "LogConfiguration": + if err := awsRestjson1_deserializeDocumentLogConfiguration(&sv.LogConfiguration, value); err != nil { + return err + } + case "ManifestProcessingRules": if err := awsRestjson1_deserializeDocumentManifestProcessingRules(&sv.ManifestProcessingRules, value); err != nil { return err @@ -3956,6 +4122,11 @@ func awsRestjson1_deserializeOpDocumentPutPlaybackConfigurationOutput(v **PutPla return err } + case "LogConfiguration": + if err := awsRestjson1_deserializeDocumentLogConfiguration(&sv.LogConfiguration, value); err != nil { + return err + } + case "ManifestProcessingRules": if err := awsRestjson1_deserializeDocumentManifestProcessingRules(&sv.ManifestProcessingRules, value); err != nil { return err @@ -6420,6 +6591,50 @@ func awsRestjson1_deserializeDocumentLivePreRollConfiguration(v **types.LivePreR return nil } +func awsRestjson1_deserializeDocumentLogConfiguration(v **types.LogConfiguration, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.LogConfiguration + if *v == nil { + sv = &types.LogConfiguration{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "PercentEnabled": + if value != nil { + jtv, ok := value.(json.Number) + if !ok { + return fmt.Errorf("expected __integer to be json.Number, got %T instead", value) + } + i64, err := jtv.Int64() + if err != nil { + return err + } + sv.PercentEnabled = int32(i64) + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsRestjson1_deserializeDocumentManifestProcessingRules(v **types.ManifestProcessingRules, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -6522,6 +6737,11 @@ func awsRestjson1_deserializeDocumentPlaybackConfiguration(v **types.PlaybackCon return err } + case "LogConfiguration": + if err := awsRestjson1_deserializeDocumentLogConfiguration(&sv.LogConfiguration, value); err != nil { + return err + } + case "ManifestProcessingRules": if err := awsRestjson1_deserializeDocumentManifestProcessingRules(&sv.ManifestProcessingRules, value); err != nil { return err diff --git a/service/mediatailor/generated.json b/service/mediatailor/generated.json index d101a8f8d1c..4f0ba0ab34c 100644 --- a/service/mediatailor/generated.json +++ b/service/mediatailor/generated.json @@ -5,6 +5,7 @@ }, "files": [ "api_client.go", + "api_op_ConfigureLogsForPlaybackConfiguration.go", "api_op_CreateChannel.go", "api_op_CreateProgram.go", "api_op_CreateSourceLocation.go", diff --git a/service/mediatailor/serializers.go b/service/mediatailor/serializers.go index 51f4ae29deb..7029ebc20d2 100644 --- a/service/mediatailor/serializers.go +++ b/service/mediatailor/serializers.go @@ -14,6 +14,79 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) +type awsRestjson1_serializeOpConfigureLogsForPlaybackConfiguration struct { +} + +func (*awsRestjson1_serializeOpConfigureLogsForPlaybackConfiguration) ID() string { + return "OperationSerializer" +} + +func (m *awsRestjson1_serializeOpConfigureLogsForPlaybackConfiguration) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) ( + out middleware.SerializeOutput, metadata middleware.Metadata, err error, +) { + request, ok := in.Request.(*smithyhttp.Request) + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown transport type %T", in.Request)} + } + + input, ok := in.Parameters.(*ConfigureLogsForPlaybackConfigurationInput) + _ = input + if !ok { + return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown input parameters type %T", in.Parameters)} + } + + opPath, opQuery := httpbinding.SplitURI("/configureLogs/playbackConfiguration") + request.URL.Path = smithyhttp.JoinPath(request.URL.Path, opPath) + request.URL.RawQuery = smithyhttp.JoinRawQuery(request.URL.RawQuery, opQuery) + request.Method = "PUT" + restEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header) + if err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + restEncoder.SetHeader("Content-Type").String("application/json") + + jsonEncoder := smithyjson.NewEncoder() + if err := awsRestjson1_serializeOpDocumentConfigureLogsForPlaybackConfigurationInput(input, jsonEncoder.Value); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request, err = request.SetStream(bytes.NewReader(jsonEncoder.Bytes())); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + + if request.Request, err = restEncoder.Encode(request.Request); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + in.Request = request + + return next.HandleSerialize(ctx, in) +} +func awsRestjson1_serializeOpHttpBindingsConfigureLogsForPlaybackConfigurationInput(v *ConfigureLogsForPlaybackConfigurationInput, encoder *httpbinding.Encoder) error { + if v == nil { + return fmt.Errorf("unsupported serialization of nil %T", v) + } + + return nil +} + +func awsRestjson1_serializeOpDocumentConfigureLogsForPlaybackConfigurationInput(v *ConfigureLogsForPlaybackConfigurationInput, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + { + ok := object.Key("PercentEnabled") + ok.Integer(v.PercentEnabled) + } + + if v.PlaybackConfigurationName != nil { + ok := object.Key("PlaybackConfigurationName") + ok.String(*v.PlaybackConfigurationName) + } + + return nil +} + type awsRestjson1_serializeOpCreateChannel struct { } diff --git a/service/mediatailor/types/types.go b/service/mediatailor/types/types.go index fb9240c4323..f58b7ffbbb4 100644 --- a/service/mediatailor/types/types.go +++ b/service/mediatailor/types/types.go @@ -369,6 +369,24 @@ type LivePreRollConfiguration struct { noSmithyDocumentSerde } +// Returns Amazon CloudWatch log settings for a playback configuration. +type LogConfiguration struct { + + // The percentage of session logs that MediaTailor sends to your Cloudwatch Logs + // account. For example, if your playback configuration has 1000 sessions and + // percentEnabled is set to 60, MediaTailor sends logs for 600 of the sessions to + // CloudWatch Logs. MediaTailor decides at random which of the playback + // configuration sessions to send logs for. If you want to view logs for a specific + // session, you can use the debug log mode + // (https://docs.aws.amazon.com/mediatailor/latest/ug/debug-log-mode.html). Valid + // values: 0 - 100 + // + // This member is required. + PercentEnabled int32 + + noSmithyDocumentSerde +} + // The configuration for manifest processing rules. Manifest processing rules // enable customization of the personalized manifests created by MediaTailor. type ManifestProcessingRules struct { @@ -423,6 +441,9 @@ type PlaybackConfiguration struct { // The configuration for pre-roll ad insertion. LivePreRollConfiguration *LivePreRollConfiguration + // The Amazon CloudWatch log settings for a playback configuration. + LogConfiguration *LogConfiguration + // The configuration for manifest processing rules. Manifest processing rules // enable customization of the personalized manifests created by MediaTailor. ManifestProcessingRules *ManifestProcessingRules diff --git a/service/mediatailor/validators.go b/service/mediatailor/validators.go index 1c5387cd214..3188bdf5f24 100644 --- a/service/mediatailor/validators.go +++ b/service/mediatailor/validators.go @@ -10,6 +10,26 @@ import ( "github.com/aws/smithy-go/middleware" ) +type validateOpConfigureLogsForPlaybackConfiguration struct { +} + +func (*validateOpConfigureLogsForPlaybackConfiguration) ID() string { + return "OperationInputValidation" +} + +func (m *validateOpConfigureLogsForPlaybackConfiguration) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) ( + out middleware.InitializeOutput, metadata middleware.Metadata, err error, +) { + input, ok := in.Parameters.(*ConfigureLogsForPlaybackConfigurationInput) + if !ok { + return out, metadata, fmt.Errorf("unknown input parameters type %T", in.Parameters) + } + if err := validateOpConfigureLogsForPlaybackConfigurationInput(input); err != nil { + return out, metadata, err + } + return next.HandleInitialize(ctx, in) +} + type validateOpCreateChannel struct { } @@ -570,6 +590,10 @@ func (m *validateOpUpdateVodSource) HandleInitialize(ctx context.Context, in mid return next.HandleInitialize(ctx, in) } +func addOpConfigureLogsForPlaybackConfigurationValidationMiddleware(stack *middleware.Stack) error { + return stack.Initialize.Add(&validateOpConfigureLogsForPlaybackConfiguration{}, middleware.After) +} + func addOpCreateChannelValidationMiddleware(stack *middleware.Stack) error { return stack.Initialize.Add(&validateOpCreateChannel{}, middleware.After) } @@ -807,6 +831,21 @@ func validateTransition(v *types.Transition) error { } } +func validateOpConfigureLogsForPlaybackConfigurationInput(v *ConfigureLogsForPlaybackConfigurationInput) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "ConfigureLogsForPlaybackConfigurationInput"} + if v.PlaybackConfigurationName == nil { + invalidParams.Add(smithy.NewErrParamRequired("PlaybackConfigurationName")) + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + func validateOpCreateChannelInput(v *CreateChannelInput) error { if v == nil { return nil diff --git a/service/opensearch/api_op_ListDomainNames.go b/service/opensearch/api_op_ListDomainNames.go index 61caeddac7e..1b8cb3e3664 100644 --- a/service/opensearch/api_op_ListDomainNames.go +++ b/service/opensearch/api_op_ListDomainNames.go @@ -27,15 +27,21 @@ func (c *Client) ListDomainNames(ctx context.Context, params *ListDomainNamesInp return out, nil } +// Container for the parameters to the ListDomainNames operation. type ListDomainNamesInput struct { + + // Optional parameter to filter the output by domain engine type. Acceptable values + // are 'Elasticsearch' and 'OpenSearch'. + EngineType types.EngineType + noSmithyDocumentSerde } // The result of a ListDomainNames operation. Contains the names of all domains -// owned by this account. +// owned by this account and their respective engine types. type ListDomainNamesOutput struct { - // List of domain names. + // List of domain names and respective engine types. DomainNames []types.DomainInfo // Metadata pertaining to the operation's result. diff --git a/service/opensearch/deserializers.go b/service/opensearch/deserializers.go index 21df170e358..0e62217a511 100644 --- a/service/opensearch/deserializers.go +++ b/service/opensearch/deserializers.go @@ -8265,6 +8265,15 @@ func awsRestjson1_deserializeDocumentDomainInfo(v **types.DomainInfo, value inte sv.DomainName = ptr.String(jtv) } + case "EngineType": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected EngineType to be of type string, got %T instead", value) + } + sv.EngineType = types.EngineType(jtv) + } + default: _, _ = key, value diff --git a/service/opensearch/serializers.go b/service/opensearch/serializers.go index 06c22fa2066..a3a500ce812 100644 --- a/service/opensearch/serializers.go +++ b/service/opensearch/serializers.go @@ -1896,6 +1896,10 @@ func (m *awsRestjson1_serializeOpListDomainNames) HandleSerialize(ctx context.Co return out, metadata, &smithy.SerializationError{Err: err} } + if err := awsRestjson1_serializeOpHttpBindingsListDomainNamesInput(input, restEncoder); err != nil { + return out, metadata, &smithy.SerializationError{Err: err} + } + if request.Request, err = restEncoder.Encode(request.Request); err != nil { return out, metadata, &smithy.SerializationError{Err: err} } @@ -1908,6 +1912,10 @@ func awsRestjson1_serializeOpHttpBindingsListDomainNamesInput(v *ListDomainNames return fmt.Errorf("unsupported serialization of nil %T", v) } + if len(v.EngineType) > 0 { + encoder.SetQuery("engineType").String(string(v.EngineType)) + } + return nil } diff --git a/service/opensearch/types/enums.go b/service/opensearch/types/enums.go index 58bc4b956dd..32f5151e82a 100644 --- a/service/opensearch/types/enums.go +++ b/service/opensearch/types/enums.go @@ -136,6 +136,24 @@ func (DomainPackageStatus) Values() []DomainPackageStatus { } } +type EngineType string + +// Enum values for EngineType +const ( + EngineTypeOpenSearch EngineType = "OpenSearch" + EngineTypeElasticsearch EngineType = "Elasticsearch" +) + +// Values returns all known values for EngineType. 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 (EngineType) Values() []EngineType { + return []EngineType{ + "OpenSearch", + "Elasticsearch", + } +} + type InboundConnectionStatusCode string // Enum values for InboundConnectionStatusCode diff --git a/service/opensearch/types/types.go b/service/opensearch/types/types.go index cc7c47b7da5..891e29f42ba 100644 --- a/service/opensearch/types/types.go +++ b/service/opensearch/types/types.go @@ -300,6 +300,8 @@ type AWSDomainInformation struct { // The configuration for the domain cluster, such as the type and number of // instances. type ClusterConfig struct { + + // Specifies the ColdStorageOptions config for a Domain ColdStorageOptions *ColdStorageOptions // Total number of dedicated master nodes, active and on standby, for the cluster. @@ -396,8 +398,11 @@ type CognitoOptionsStatus struct { noSmithyDocumentSerde } +// Specifies the configuration for cold storage options such as enabled type ColdStorageOptions struct { + // Enable cold storage option. Accepted values true or false + // // This member is required. Enabled *bool @@ -536,6 +541,9 @@ type DomainInfo struct { // The DomainName. DomainName *string + // Specifies the EngineType of the domain. + EngineType EngineType + noSmithyDocumentSerde } diff --git a/service/quicksight/internal/endpoints/endpoints.go b/service/quicksight/internal/endpoints/endpoints.go index 3f60648b2e3..2a6fdce1afc 100644 --- a/service/quicksight/internal/endpoints/endpoints.go +++ b/service/quicksight/internal/endpoints/endpoints.go @@ -62,6 +62,22 @@ var defaultPartitions = endpoints.Partitions{ }, RegionRegex: partitionRegexp.Aws, IsRegionalized: true, + Endpoints: endpoints.Endpoints{ + "ap-northeast-1": endpoints.Endpoint{}, + "ap-northeast-2": endpoints.Endpoint{}, + "ap-south-1": endpoints.Endpoint{}, + "ap-southeast-1": endpoints.Endpoint{}, + "ap-southeast-2": endpoints.Endpoint{}, + "api": endpoints.Endpoint{}, + "ca-central-1": endpoints.Endpoint{}, + "eu-central-1": endpoints.Endpoint{}, + "eu-west-1": endpoints.Endpoint{}, + "eu-west-2": endpoints.Endpoint{}, + "sa-east-1": endpoints.Endpoint{}, + "us-east-1": endpoints.Endpoint{}, + "us-east-2": endpoints.Endpoint{}, + "us-west-2": endpoints.Endpoint{}, + }, }, { ID: "aws-cn", @@ -102,5 +118,9 @@ var defaultPartitions = endpoints.Partitions{ }, RegionRegex: partitionRegexp.AwsUsGov, IsRegionalized: true, + Endpoints: endpoints.Endpoints{ + "api": endpoints.Endpoint{}, + "us-gov-west-1": endpoints.Endpoint{}, + }, }, } diff --git a/service/ssm/api_op_AssociateOpsItemRelatedItem.go b/service/ssm/api_op_AssociateOpsItemRelatedItem.go index c35edf54fd3..81990105914 100644 --- a/service/ssm/api_op_AssociateOpsItemRelatedItem.go +++ b/service/ssm/api_op_AssociateOpsItemRelatedItem.go @@ -10,9 +10,9 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Associates a related resource to a Systems Manager OpsCenter OpsItem. For -// example, you can associate an Incident Manager incident or analysis with an -// OpsItem. Incident Manager is a capability of Amazon Web Services Systems +// Associates a related item to a Systems Manager OpsCenter OpsItem. For example, +// you can associate an Incident Manager incident or analysis with an OpsItem. +// Incident Manager and OpsCenter are capabilities of Amazon Web Services Systems // Manager. func (c *Client) AssociateOpsItemRelatedItem(ctx context.Context, params *AssociateOpsItemRelatedItemInput, optFns ...func(*Options)) (*AssociateOpsItemRelatedItemOutput, error) { if params == nil { @@ -45,8 +45,7 @@ type AssociateOpsItemRelatedItemInput struct { // The type of resource that you want to associate with an OpsItem. OpsCenter // supports the following types: AWS::SSMIncidents::IncidentRecord: an Incident - // Manager incident. Incident Manager is a capability of Amazon Web Services - // Systems Manager. AWS::SSM::Document: a Systems Manager (SSM) document. + // Manager incident. AWS::SSM::Document: a Systems Manager (SSM) document. // // This member is required. ResourceType *string diff --git a/service/ssm/api_op_DescribeParameters.go b/service/ssm/api_op_DescribeParameters.go index 1f8965def47..ee8eba94349 100644 --- a/service/ssm/api_op_DescribeParameters.go +++ b/service/ssm/api_op_DescribeParameters.go @@ -18,7 +18,10 @@ import ( // can be between zero and the value of MaxResults. If the service reaches an // internal limit while processing the results, it stops the operation and returns // the matching values up to that point and a NextToken. You can specify the -// NextToken in a subsequent call to get the next set of results. +// NextToken in a subsequent call to get the next set of results. If you change the +// KMS key alias for the KMS key used to encrypt a parameter, then you must also +// update the key alias the parameter uses to reference KMS. Otherwise, +// DescribeParameters retrieves whatever the original key alias was referencing. func (c *Client) DescribeParameters(ctx context.Context, params *DescribeParametersInput, optFns ...func(*Options)) (*DescribeParametersOutput, error) { if params == nil { params = &DescribeParametersInput{} diff --git a/service/ssm/api_op_DisassociateOpsItemRelatedItem.go b/service/ssm/api_op_DisassociateOpsItemRelatedItem.go index e8cdb06dd72..10d1cb1b5fb 100644 --- a/service/ssm/api_op_DisassociateOpsItemRelatedItem.go +++ b/service/ssm/api_op_DisassociateOpsItemRelatedItem.go @@ -10,9 +10,9 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Deletes the association between an OpsItem and a related resource. For example, -// this API operation can delete an Incident Manager incident from an OpsItem. -// Incident Manager is a capability of Amazon Web Services Systems Manager. +// Deletes the association between an OpsItem and a related item. For example, this +// API operation can delete an Incident Manager incident from an OpsItem. Incident +// Manager is a capability of Amazon Web Services Systems Manager. func (c *Client) DisassociateOpsItemRelatedItem(ctx context.Context, params *DisassociateOpsItemRelatedItemInput, optFns ...func(*Options)) (*DisassociateOpsItemRelatedItemOutput, error) { if params == nil { params = &DisassociateOpsItemRelatedItemInput{} @@ -31,13 +31,13 @@ func (c *Client) DisassociateOpsItemRelatedItem(ctx context.Context, params *Dis type DisassociateOpsItemRelatedItemInput struct { // The ID of the association for which you want to delete an association between - // the OpsItem and a related resource. + // the OpsItem and a related item. // // This member is required. AssociationId *string // The ID of the OpsItem for which you want to delete an association between the - // OpsItem and a related resource. + // OpsItem and a related item. // // This member is required. OpsItemId *string diff --git a/service/ssm/api_op_GetCommandInvocation.go b/service/ssm/api_op_GetCommandInvocation.go index 0ce7d8e195d..45284b8d236 100644 --- a/service/ssm/api_op_GetCommandInvocation.go +++ b/service/ssm/api_op_GetCommandInvocation.go @@ -4,6 +4,7 @@ package ssm import ( "context" + "errors" "fmt" awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware" "github.com/aws/aws-sdk-go-v2/aws/signer/v4" @@ -535,6 +536,13 @@ func commandExecutedStateRetryable(ctx context.Context, input *GetCommandInvocat } } + if err != nil { + var errorType *types.InvocationDoesNotExist + if errors.As(err, &errorType) { + return true, nil + } + } + return true, nil } diff --git a/service/ssm/api_op_GetMaintenanceWindowTask.go b/service/ssm/api_op_GetMaintenanceWindowTask.go index 7c088399557..0eb01acfb59 100644 --- a/service/ssm/api_op_GetMaintenanceWindowTask.go +++ b/service/ssm/api_op_GetMaintenanceWindowTask.go @@ -48,6 +48,14 @@ type GetMaintenanceWindowTaskInput struct { type GetMaintenanceWindowTaskOutput struct { + // The action to take on tasks when the maintenance window cutoff time is reached. + // CONTINUE_TASK means that tasks continue to run. For Automation, Lambda, Step + // Functions tasks, CANCEL_TASK means that currently running task invocations + // continue, but no new task invocations are started. For Run Command tasks, + // CANCEL_TASK means the system attempts to stop the task by sending a + // CancelCommand operation. + CutoffBehavior types.MaintenanceWindowTaskCutoffBehavior + // The retrieved task description. Description *string diff --git a/service/ssm/api_op_GetParameterHistory.go b/service/ssm/api_op_GetParameterHistory.go index cbd6255753f..f1f40c1a9a7 100644 --- a/service/ssm/api_op_GetParameterHistory.go +++ b/service/ssm/api_op_GetParameterHistory.go @@ -12,7 +12,10 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Retrieves the history of all changes to a parameter. +// Retrieves the history of all changes to a parameter. If you change the KMS key +// alias for the KMS key used to encrypt a parameter, then you must also update the +// key alias the parameter uses to reference KMS. Otherwise, GetParameterHistory +// retrieves whatever the original key alias was referencing. func (c *Client) GetParameterHistory(ctx context.Context, params *GetParameterHistoryInput, optFns ...func(*Options)) (*GetParameterHistoryOutput, error) { if params == nil { params = &GetParameterHistoryInput{} diff --git a/service/ssm/api_op_GetParametersByPath.go b/service/ssm/api_op_GetParametersByPath.go index 5663c843a2b..fd14a72cdd5 100644 --- a/service/ssm/api_op_GetParametersByPath.go +++ b/service/ssm/api_op_GetParametersByPath.go @@ -53,9 +53,9 @@ type GetParametersByPathInput struct { // A token to start the list. Use this token to get the next set of results. NextToken *string - // Filters to limit the request results. For GetParametersByPath, the following - // filter Key names are supported: Type, KeyId, Label, and DataType. The following - // Key values are not supported for GetParametersByPath: tag, Name, Path, and Tier. + // Filters to limit the request results. The following Key values are supported for + // GetParametersByPath: Type, KeyId, and Label. The following Key values aren't + // supported for GetParametersByPath: tag, DataType, Name, Path, and Tier. ParameterFilters []types.ParameterStringFilter // Retrieve all parameters within a hierarchy. If a user has access to a path, then diff --git a/service/ssm/api_op_ListOpsItemRelatedItems.go b/service/ssm/api_op_ListOpsItemRelatedItems.go index d2d24f8ecad..7aab7a0f5c2 100644 --- a/service/ssm/api_op_ListOpsItemRelatedItems.go +++ b/service/ssm/api_op_ListOpsItemRelatedItems.go @@ -12,7 +12,8 @@ import ( smithyhttp "github.com/aws/smithy-go/transport/http" ) -// Lists all related-item resources associated with an OpsItem. +// Lists all related-item resources associated with a Systems Manager OpsCenter +// OpsItem. OpsCenter is a capability of Amazon Web Services Systems Manager. func (c *Client) ListOpsItemRelatedItems(ctx context.Context, params *ListOpsItemRelatedItemsInput, optFns ...func(*Options)) (*ListOpsItemRelatedItemsOutput, error) { if params == nil { params = &ListOpsItemRelatedItemsInput{} diff --git a/service/ssm/api_op_RegisterTaskWithMaintenanceWindow.go b/service/ssm/api_op_RegisterTaskWithMaintenanceWindow.go index d67d9e3aa8c..ace0c73fd31 100644 --- a/service/ssm/api_op_RegisterTaskWithMaintenanceWindow.go +++ b/service/ssm/api_op_RegisterTaskWithMaintenanceWindow.go @@ -48,6 +48,28 @@ type RegisterTaskWithMaintenanceWindowInput struct { // User-provided idempotency token. ClientToken *string + // Indicates whether tasks should continue to run after the cutoff time specified + // in the maintenance windows is reached. + // + // * CONTINUE_TASK: When the cutoff time is + // reached, any tasks that are running continue. The default value. + // + // * + // CANCEL_TASK: + // + // * For Automation, Lambda, Step Functions tasks: When the cutoff + // time is reached, any task invocations that are already running continue, but no + // new task invocations are started. + // + // * For Run Command tasks: When the cutoff time + // is reached, the system sends a CancelCommand operation that attempts to cancel + // the command associated with the task. However, there is no guarantee that the + // command will be terminated and the underlying process stopped. + // + // The status for + // tasks that are not completed is TIMED_OUT. + CutoffBehavior types.MaintenanceWindowTaskCutoffBehavior + // An optional description for the task. Description *string diff --git a/service/ssm/api_op_SendCommand.go b/service/ssm/api_op_SendCommand.go index b6533efc15b..7e99ac2dcbc 100644 --- a/service/ssm/api_op_SendCommand.go +++ b/service/ssm/api_op_SendCommand.go @@ -31,10 +31,13 @@ type SendCommandInput struct { // The name of the Amazon Web Services Systems Manager document (SSM document) to // run. This can be a public document or a custom document. To run a shared - // document belonging to another account, specify the document ARN. For more - // information about how to use shared documents, see Using shared SSM documents + // document belonging to another account, specify the document Amazon Resource Name + // (ARN). For more information about how to use shared documents, see Using shared + // SSM documents // (https://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-using-shared.html) - // in the Amazon Web Services Systems Manager User Guide. + // in the Amazon Web Services Systems Manager User Guide. If you specify a document + // name or ARN that hasn't been shared with your account, you receive an + // InvalidDocument error. // // This member is required. DocumentName *string diff --git a/service/ssm/api_op_UpdateMaintenanceWindowTask.go b/service/ssm/api_op_UpdateMaintenanceWindowTask.go index 3687cde5160..27b7de2e6a4 100644 --- a/service/ssm/api_op_UpdateMaintenanceWindowTask.go +++ b/service/ssm/api_op_UpdateMaintenanceWindowTask.go @@ -75,6 +75,28 @@ type UpdateMaintenanceWindowTaskInput struct { // This member is required. WindowTaskId *string + // Indicates whether tasks should continue to run after the cutoff time specified + // in the maintenance windows is reached. + // + // * CONTINUE_TASK: When the cutoff time is + // reached, any tasks that are running continue. The default value. + // + // * + // CANCEL_TASK: + // + // * For Automation, Lambda, Step Functions tasks: When the cutoff + // time is reached, any task invocations that are already running continue, but no + // new task invocations are started. + // + // * For Run Command tasks: When the cutoff time + // is reached, the system sends a CancelCommand operation that attempts to cancel + // the command associated with the task. However, there is no guarantee that the + // command will be terminated and the underlying process stopped. + // + // The status for + // tasks that are not completed is TIMED_OUT. + CutoffBehavior types.MaintenanceWindowTaskCutoffBehavior + // The new task description to specify. Description *string @@ -171,6 +193,10 @@ type UpdateMaintenanceWindowTaskInput struct { type UpdateMaintenanceWindowTaskOutput struct { + // The specification for whether tasks should continue to run after the cutoff time + // specified in the maintenance windows is reached. + CutoffBehavior types.MaintenanceWindowTaskCutoffBehavior + // The updated task description. Description *string diff --git a/service/ssm/api_op_UpdateServiceSetting.go b/service/ssm/api_op_UpdateServiceSetting.go index 40c8b0287f2..9e6618fd702 100644 --- a/service/ssm/api_op_UpdateServiceSetting.go +++ b/service/ssm/api_op_UpdateServiceSetting.go @@ -66,25 +66,29 @@ type UpdateServiceSettingInput struct { // This member is required. SettingId *string - // The new value to specify for the service setting. For the - // /ssm/parameter-store/default-parameter-tier setting ID, the setting value can be - // one of the following. + // The new value to specify for the service setting. The following list specifies + // the available values for each setting. // - // * Standard + // * + // /ssm/parameter-store/default-parameter-tier: Standard, Advanced, + // Intelligent-Tiering + // + // * /ssm/parameter-store/high-throughput-enabled: true or + // false + // + // * /ssm/managed-instance/activation-tier: true or false // - // * Advanced + // * + // /ssm/automation/customer-script-log-destination: CloudWatch + // + // * + // /ssm/automation/customer-script-log-group-name: the name of an Amazon CloudWatch + // Logs log group // - // * Intelligent-Tiering + // * /ssm/documents/console/public-sharing-permission: Enable or + // Disable // - // For the - // /ssm/parameter-store/high-throughput-enabled, and - // /ssm/managed-instance/activation-tier setting IDs, the setting value can be true - // or false. For the /ssm/automation/customer-script-log-destination setting ID, - // the setting value can be CloudWatch. For the - // /ssm/automation/customer-script-log-group-name setting ID, the setting value can - // be the name of an Amazon CloudWatch Logs log group. For the - // /ssm/documents/console/public-sharing-permission setting ID, the setting value - // can be Enable or Disable. + // * /ssm/managed-instance/activation-tier: standard or advanced // // This member is required. SettingValue *string diff --git a/service/ssm/deserializers.go b/service/ssm/deserializers.go index a86dec84bff..c4e5d3357ac 100644 --- a/service/ssm/deserializers.go +++ b/service/ssm/deserializers.go @@ -31453,6 +31453,15 @@ func awsAwsjson11_deserializeDocumentMaintenanceWindowTask(v **types.Maintenance for key, value := range shape { switch key { + case "CutoffBehavior": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected MaintenanceWindowTaskCutoffBehavior to be of type string, got %T instead", value) + } + sv.CutoffBehavior = types.MaintenanceWindowTaskCutoffBehavior(jtv) + } + case "Description": if value != nil { jtv, ok := value.(string) @@ -43769,6 +43778,15 @@ func awsAwsjson11_deserializeOpDocumentGetMaintenanceWindowTaskOutput(v **GetMai for key, value := range shape { switch key { + case "CutoffBehavior": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected MaintenanceWindowTaskCutoffBehavior to be of type string, got %T instead", value) + } + sv.CutoffBehavior = types.MaintenanceWindowTaskCutoffBehavior(jtv) + } + case "Description": if value != nil { jtv, ok := value.(string) @@ -46493,6 +46511,15 @@ func awsAwsjson11_deserializeOpDocumentUpdateMaintenanceWindowTaskOutput(v **Upd for key, value := range shape { switch key { + case "CutoffBehavior": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected MaintenanceWindowTaskCutoffBehavior to be of type string, got %T instead", value) + } + sv.CutoffBehavior = types.MaintenanceWindowTaskCutoffBehavior(jtv) + } + case "Description": if value != nil { jtv, ok := value.(string) diff --git a/service/ssm/serializers.go b/service/ssm/serializers.go index 61852401c69..dd445aeaee2 100644 --- a/service/ssm/serializers.go +++ b/service/ssm/serializers.go @@ -12146,6 +12146,11 @@ func awsAwsjson11_serializeOpDocumentRegisterTaskWithMaintenanceWindowInput(v *R ok.String(*v.ClientToken) } + if len(v.CutoffBehavior) > 0 { + ok := object.Key("CutoffBehavior") + ok.String(string(v.CutoffBehavior)) + } + if v.Description != nil { ok := object.Key("Description") ok.String(*v.Description) @@ -12963,6 +12968,11 @@ func awsAwsjson11_serializeOpDocumentUpdateMaintenanceWindowTaskInput(v *UpdateM object := value.Object() defer object.Close() + if len(v.CutoffBehavior) > 0 { + ok := object.Key("CutoffBehavior") + ok.String(string(v.CutoffBehavior)) + } + if v.Description != nil { ok := object.Key("Description") ok.String(*v.Description) diff --git a/service/ssm/types/enums.go b/service/ssm/types/enums.go index 8984a52d18e..f01c9ec928c 100644 --- a/service/ssm/types/enums.go +++ b/service/ssm/types/enums.go @@ -1018,6 +1018,25 @@ func (MaintenanceWindowResourceType) Values() []MaintenanceWindowResourceType { } } +type MaintenanceWindowTaskCutoffBehavior string + +// Enum values for MaintenanceWindowTaskCutoffBehavior +const ( + MaintenanceWindowTaskCutoffBehaviorContinueTask MaintenanceWindowTaskCutoffBehavior = "CONTINUE_TASK" + MaintenanceWindowTaskCutoffBehaviorCancelTask MaintenanceWindowTaskCutoffBehavior = "CANCEL_TASK" +) + +// Values returns all known values for MaintenanceWindowTaskCutoffBehavior. 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 (MaintenanceWindowTaskCutoffBehavior) Values() []MaintenanceWindowTaskCutoffBehavior { + return []MaintenanceWindowTaskCutoffBehavior{ + "CONTINUE_TASK", + "CANCEL_TASK", + } +} + type MaintenanceWindowTaskType string // Enum values for MaintenanceWindowTaskType diff --git a/service/ssm/types/types.go b/service/ssm/types/types.go index 02a9b92f8fd..dcbfd2422e6 100644 --- a/service/ssm/types/types.go +++ b/service/ssm/types/types.go @@ -993,12 +993,13 @@ type CommandFilter struct { // before July 7, 2021. // // * Status: Specify a valid command status to see a list of - // all command executions with that status. Status values you can specify - // include: + // all command executions with that status. The status choices depend on the API + // you call. The status values you can specify for ListCommands are: // // * Pending // - // * InProgress + // * + // InProgress // // * Success // @@ -1006,25 +1007,68 @@ type CommandFilter struct { // // * Failed // + // * TimedOut (this includes both + // Delivery and Execution time outs) + // + // * AccessDenied + // + // * DeliveryTimedOut + // // * - // TimedOut + // ExecutionTimedOut // - // * Cancelling + // * Incomplete // - // * DocumentName: Specify name of the Amazon Web Services - // Systems Manager document (SSM document) for which you want to see command - // execution results. For example, specify AWS-RunPatchBaseline to see command - // executions that used this SSM document to perform security patching operations - // on instances. + // * NoInstancesInTag // - // * ExecutionStage: Specify one of the following values: + // * LimitExceeded + // + // The status + // values you can specify for ListCommandInvocations are: + // + // * Pending + // + // * + // InProgress + // + // * Delayed + // + // * Success + // + // * Cancelled + // + // * Failed + // + // * TimedOut (this + // includes both Delivery and Execution time outs) + // + // * AccessDenied + // + // * + // DeliveryTimedOut + // + // * ExecutionTimedOut + // + // * Undeliverable + // + // * InvalidPlatform // // * - // Executing: Returns a list of command executions that are currently still - // running. + // Terminated // - // * Complete: Returns a list of command executions that have already - // completed. + // * DocumentName: Specify name of the Amazon Web Services Systems + // Manager document (SSM document) for which you want to see command execution + // results. For example, specify AWS-RunPatchBaseline to see command executions + // that used this SSM document to perform security patching operations on + // instances. + // + // * ExecutionStage: Specify one of the following values: + // + // * Executing: + // Returns a list of command executions that are currently still running. + // + // * + // Complete: Returns a list of command executions that have already completed. // // This member is required. Value *string @@ -1062,8 +1106,7 @@ type CommandInvocation struct { // The instance ID in which this invocation was requested. InstanceId *string - // The name of the invocation target. For EC2 instances this is the value for the - // aws:Name tag. For on-premises instances, this is the name of the instance. + // The fully qualified host name of the managed instance. InstanceName *string // Configurations for sending notifications about command status changes on a per @@ -3049,6 +3092,10 @@ type MaintenanceWindowTarget struct { // Information about a task defined for a maintenance window. type MaintenanceWindowTask struct { + // The specification for whether tasks should continue to run after the cutoff time + // specified in the maintenance windows is reached. + CutoffBehavior MaintenanceWindowTaskCutoffBehavior + // A description of the task. Description *string @@ -3830,11 +3877,11 @@ type ParameterStringFilter struct { // The name of the filter. The ParameterStringFilter object is used by the // DescribeParameters and GetParametersByPath API operations. However, not all of // the pattern values listed for Key can be used with both operations. For - // DescribeActions, all of the listed patterns are valid, with the exception of - // Label. For GetParametersByPath, the following patterns listed for Key aren't - // valid: tag, Name, Path, and Tier. For examples of Amazon Web Services CLI - // commands demonstrating valid parameter filter constructions, see Searching for - // Systems Manager parameters + // DescribeActions, all of the listed patterns are valid except Label. For + // GetParametersByPath, the following patterns listed for Key aren't valid: tag, + // DataType, Name, Path, and Tier. For examples of Amazon Web Services CLI commands + // demonstrating valid parameter filter constructions, see Searching for Systems + // Manager parameters // (https://docs.aws.amazon.com/systems-manager/latest/userguide/parameter-search.html) // in the Amazon Web Services Systems Manager User Guide. // diff --git a/service/wafv2/deserializers.go b/service/wafv2/deserializers.go index d18049a799a..4d215ff96ca 100644 --- a/service/wafv2/deserializers.go +++ b/service/wafv2/deserializers.go @@ -9440,6 +9440,56 @@ func awsAwsjson11_deserializeDocumentRegex(v **types.Regex, value interface{}) e return nil } +func awsAwsjson11_deserializeDocumentRegexMatchStatement(v **types.RegexMatchStatement, value interface{}) error { + if v == nil { + return fmt.Errorf("unexpected nil of type %T", v) + } + if value == nil { + return nil + } + + shape, ok := value.(map[string]interface{}) + if !ok { + return fmt.Errorf("unexpected JSON type %v", value) + } + + var sv *types.RegexMatchStatement + if *v == nil { + sv = &types.RegexMatchStatement{} + } else { + sv = *v + } + + for key, value := range shape { + switch key { + case "FieldToMatch": + if err := awsAwsjson11_deserializeDocumentFieldToMatch(&sv.FieldToMatch, value); err != nil { + return err + } + + case "RegexString": + if value != nil { + jtv, ok := value.(string) + if !ok { + return fmt.Errorf("expected RegexPatternString to be of type string, got %T instead", value) + } + sv.RegexString = ptr.String(jtv) + } + + case "TextTransformations": + if err := awsAwsjson11_deserializeDocumentTextTransformations(&sv.TextTransformations, value); err != nil { + return err + } + + default: + _, _ = key, value + + } + } + *v = sv + return nil +} + func awsAwsjson11_deserializeDocumentRegexPatternSet(v **types.RegexPatternSet, value interface{}) error { if v == nil { return fmt.Errorf("unexpected nil of type %T", v) @@ -10639,6 +10689,11 @@ func awsAwsjson11_deserializeDocumentStatement(v **types.Statement, value interf return err } + case "RegexMatchStatement": + if err := awsAwsjson11_deserializeDocumentRegexMatchStatement(&sv.RegexMatchStatement, value); err != nil { + return err + } + case "RegexPatternSetReferenceStatement": if err := awsAwsjson11_deserializeDocumentRegexPatternSetReferenceStatement(&sv.RegexPatternSetReferenceStatement, value); err != nil { return err diff --git a/service/wafv2/serializers.go b/service/wafv2/serializers.go index 2cef02607ae..017a9a486e2 100644 --- a/service/wafv2/serializers.go +++ b/service/wafv2/serializers.go @@ -2969,6 +2969,32 @@ func awsAwsjson11_serializeDocumentRegex(v *types.Regex, value smithyjson.Value) return nil } +func awsAwsjson11_serializeDocumentRegexMatchStatement(v *types.RegexMatchStatement, value smithyjson.Value) error { + object := value.Object() + defer object.Close() + + if v.FieldToMatch != nil { + ok := object.Key("FieldToMatch") + if err := awsAwsjson11_serializeDocumentFieldToMatch(v.FieldToMatch, ok); err != nil { + return err + } + } + + if v.RegexString != nil { + ok := object.Key("RegexString") + ok.String(*v.RegexString) + } + + if v.TextTransformations != nil { + ok := object.Key("TextTransformations") + if err := awsAwsjson11_serializeDocumentTextTransformations(v.TextTransformations, ok); err != nil { + return err + } + } + + return nil +} + func awsAwsjson11_serializeDocumentRegexPatternSetReferenceStatement(v *types.RegexPatternSetReferenceStatement, value smithyjson.Value) error { object := value.Object() defer object.Close() @@ -3263,6 +3289,13 @@ func awsAwsjson11_serializeDocumentStatement(v *types.Statement, value smithyjso } } + if v.RegexMatchStatement != nil { + ok := object.Key("RegexMatchStatement") + if err := awsAwsjson11_serializeDocumentRegexMatchStatement(v.RegexMatchStatement, ok); err != nil { + return err + } + } + if v.RegexPatternSetReferenceStatement != nil { ok := object.Key("RegexPatternSetReferenceStatement") if err := awsAwsjson11_serializeDocumentRegexPatternSetReferenceStatement(v.RegexPatternSetReferenceStatement, ok); err != nil { diff --git a/service/wafv2/types/types.go b/service/wafv2/types/types.go index adc9663fc13..a5e73f34c2c 100644 --- a/service/wafv2/types/types.go +++ b/service/wafv2/types/types.go @@ -1368,6 +1368,33 @@ type Regex struct { noSmithyDocumentSerde } +// A rule statement used to search web request components for a match against a +// single regular expression. +type RegexMatchStatement struct { + + // The part of a web request that you want WAF to inspect. For more information, + // see FieldToMatch. + // + // This member is required. + FieldToMatch *FieldToMatch + + // The string representing the regular expression. + // + // This member is required. + RegexString *string + + // Text transformations eliminate some of the unusual formatting that attackers use + // in web requests in an effort to bypass detection. If you specify one or more + // transformations in a rule statement, WAF performs all transformations on the + // content of the request component identified by FieldToMatch, starting from the + // lowest priority setting, before inspecting the content for a match. + // + // This member is required. + TextTransformations []TextTransformation + + noSmithyDocumentSerde +} + // Contains one or more regular expressions. WAF assigns an ARN to each // RegexPatternSet that you create. To use a set in a rule, you provide the ARN to // the Rule statement RegexPatternSetReferenceStatement. @@ -1953,6 +1980,10 @@ type Statement struct { // a web ACL and inside a rule group. RateBasedStatement *RateBasedStatement + // A rule statement used to search web request components for a match against a + // single regular expression. + RegexMatchStatement *RegexMatchStatement + // A rule statement used to search web request components for matches with regular // expressions. To use this, create a RegexPatternSet that specifies the // expressions that you want to detect, then use the ARN of that set in this diff --git a/service/wafv2/validators.go b/service/wafv2/validators.go index d8b1c9d7bb8..84bd03e6340 100644 --- a/service/wafv2/validators.go +++ b/service/wafv2/validators.go @@ -1765,6 +1765,35 @@ func validateRedactedFields(v []types.FieldToMatch) error { } } +func validateRegexMatchStatement(v *types.RegexMatchStatement) error { + if v == nil { + return nil + } + invalidParams := smithy.InvalidParamsError{Context: "RegexMatchStatement"} + if v.RegexString == nil { + invalidParams.Add(smithy.NewErrParamRequired("RegexString")) + } + if v.FieldToMatch == nil { + invalidParams.Add(smithy.NewErrParamRequired("FieldToMatch")) + } else if v.FieldToMatch != nil { + if err := validateFieldToMatch(v.FieldToMatch); err != nil { + invalidParams.AddNested("FieldToMatch", err.(smithy.InvalidParamsError)) + } + } + if v.TextTransformations == nil { + invalidParams.Add(smithy.NewErrParamRequired("TextTransformations")) + } else if v.TextTransformations != nil { + if err := validateTextTransformations(v.TextTransformations); err != nil { + invalidParams.AddNested("TextTransformations", err.(smithy.InvalidParamsError)) + } + } + if invalidParams.Len() > 0 { + return invalidParams + } else { + return nil + } +} + func validateRegexPatternSetReferenceStatement(v *types.RegexPatternSetReferenceStatement) error { if v == nil { return nil @@ -2062,6 +2091,11 @@ func validateStatement(v *types.Statement) error { invalidParams.AddNested("LabelMatchStatement", err.(smithy.InvalidParamsError)) } } + if v.RegexMatchStatement != nil { + if err := validateRegexMatchStatement(v.RegexMatchStatement); err != nil { + invalidParams.AddNested("RegexMatchStatement", err.(smithy.InvalidParamsError)) + } + } if invalidParams.Len() > 0 { return invalidParams } else {