diff --git a/CHANGELOG.md b/CHANGELOG.md index 88a28ee14db..76175f828a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,21 @@ +Release v1.45.20 (2023-10-02) +=== + +### Service Client Updates +* `service/bedrock`: Updates service API, documentation, waiters, and paginators +* `service/bedrock-runtime`: Updates service API and documentation +* `service/ec2`: Updates service API + * Introducing Amazon EC2 R7iz instances with 3.9 GHz sustained all-core turbo frequency and deliver up to 20% better performance than previous generation z1d instances. +* `service/managedblockchain`: Updates service documentation +* `service/rds`: Updates service API, documentation, waiters, paginators, and examples + * Adds DefaultCertificateForNewLaunches field in the DescribeCertificates API response. +* `service/sso`: Adds new service + * Fix FIPS Endpoints in aws-us-gov. +* `service/sts`: Updates service API and documentation + * STS API updates for assumeRole +* `service/transfer`: Updates service documentation + * Documentation updates for AWS Transfer Family + Release v1.45.19 (2023-09-28) === diff --git a/aws/endpoints/defaults.go b/aws/endpoints/defaults.go index 462b3f92f69..c370084208a 100644 --- a/aws/endpoints/defaults.go +++ b/aws/endpoints/defaults.go @@ -4468,6 +4468,99 @@ var awsPartition = partition{ }, }, }, + "bedrock": service{ + Endpoints: serviceEndpoints{ + endpointKey{ + Region: "ap-southeast-1", + }: endpoint{}, + endpointKey{ + Region: "bedrock-ap-southeast-1", + }: endpoint{ + Hostname: "bedrock.ap-southeast-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-southeast-1", + }, + }, + endpointKey{ + Region: "bedrock-fips-us-east-1", + }: endpoint{ + Hostname: "bedrock-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + endpointKey{ + Region: "bedrock-fips-us-west-2", + }: endpoint{ + Hostname: "bedrock-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + endpointKey{ + Region: "bedrock-runtime-ap-southeast-1", + }: endpoint{ + Hostname: "bedrock-runtime.ap-southeast-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "ap-southeast-1", + }, + }, + endpointKey{ + Region: "bedrock-runtime-fips-us-east-1", + }: endpoint{ + Hostname: "bedrock-runtime-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + endpointKey{ + Region: "bedrock-runtime-fips-us-west-2", + }: endpoint{ + Hostname: "bedrock-runtime-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + endpointKey{ + Region: "bedrock-runtime-us-east-1", + }: endpoint{ + Hostname: "bedrock-runtime.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + endpointKey{ + Region: "bedrock-runtime-us-west-2", + }: endpoint{ + Hostname: "bedrock-runtime.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + endpointKey{ + Region: "bedrock-us-east-1", + }: endpoint{ + Hostname: "bedrock.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, + endpointKey{ + Region: "bedrock-us-west-2", + }: endpoint{ + Hostname: "bedrock.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, + endpointKey{ + Region: "us-east-1", + }: endpoint{}, + endpointKey{ + Region: "us-west-2", + }: endpoint{}, + }, + }, "billingconductor": service{ PartitionEndpoint: "aws-global", IsRegionalized: boxedFalse, @@ -17737,6 +17830,9 @@ var awsPartition = partition{ endpointKey{ Region: "ap-south-1", }: endpoint{}, + endpointKey{ + Region: "ap-south-2", + }: endpoint{}, endpointKey{ Region: "ap-southeast-1", }: endpoint{}, @@ -17746,12 +17842,18 @@ var awsPartition = partition{ endpointKey{ Region: "ap-southeast-3", }: endpoint{}, + endpointKey{ + Region: "ap-southeast-4", + }: endpoint{}, endpointKey{ Region: "ca-central-1", }: endpoint{}, endpointKey{ Region: "eu-central-1", }: endpoint{}, + endpointKey{ + Region: "eu-central-2", + }: endpoint{}, endpointKey{ Region: "eu-north-1", }: endpoint{}, @@ -23328,6 +23430,11 @@ var awsPartition = partition{ }: endpoint{ Hostname: "resource-explorer-2.ap-southeast-2.api.aws", }, + endpointKey{ + Region: "ap-southeast-3", + }: endpoint{ + Hostname: "resource-explorer-2.ap-southeast-3.api.aws", + }, endpointKey{ Region: "ap-southeast-4", }: endpoint{ @@ -23373,6 +23480,11 @@ var awsPartition = partition{ }: endpoint{ Hostname: "resource-explorer-2.il-central-1.api.aws", }, + endpointKey{ + Region: "me-south-1", + }: endpoint{ + Hostname: "resource-explorer-2.me-south-1.api.aws", + }, endpointKey{ Region: "sa-east-1", }: endpoint{ diff --git a/aws/version.go b/aws/version.go index f46db796823..f556d8d0f6a 100644 --- a/aws/version.go +++ b/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go" // SDKVersion is the version of this SDK -const SDKVersion = "1.45.19" +const SDKVersion = "1.45.20" diff --git a/models/apis/bedrock-runtime/2023-09-30/api-2.json b/models/apis/bedrock-runtime/2023-09-30/api-2.json index e89926b2e50..b1bcc5c0441 100644 --- a/models/apis/bedrock-runtime/2023-09-30/api-2.json +++ b/models/apis/bedrock-runtime/2023-09-30/api-2.json @@ -87,7 +87,7 @@ "type":"string", "max":2048, "min":1, - "pattern":"^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})|(([0-9a-zA-Z][_-]?)+)$" + "pattern":"^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63}))|([0-9]{12}:provisioned-model/[a-z0-9]{12})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63}))|(([0-9a-zA-Z][_-]?)+)$" }, "InvokeModelRequest":{ "type":"structure", @@ -257,6 +257,7 @@ "chunk":{"shape":"PayloadPart"}, "internalServerException":{"shape":"InternalServerException"}, "modelStreamErrorException":{"shape":"ModelStreamErrorException"}, + "modelTimeoutException":{"shape":"ModelTimeoutException"}, "throttlingException":{"shape":"ThrottlingException"}, "validationException":{"shape":"ValidationException"} }, diff --git a/models/apis/bedrock-runtime/2023-09-30/docs-2.json b/models/apis/bedrock-runtime/2023-09-30/docs-2.json index cdb1c1db6d8..7be83cad5ed 100644 --- a/models/apis/bedrock-runtime/2023-09-30/docs-2.json +++ b/models/apis/bedrock-runtime/2023-09-30/docs-2.json @@ -2,8 +2,8 @@ "version": "2.0", "service": "

Describes the API operations for running inference using Bedrock models.

", "operations": { - "InvokeModel": "

Invokes the specified Bedrock model to run inference using the input provided in the request body. You use InvokeModel to run inference for text models, image models, and embedding models.

For more information about invoking models, see Using the API in the Bedrock User Guide.

For example requests, see Examples (after the Errors section).

", - "InvokeModelWithResponseStream": "

Invoke the specified Bedrock model to run inference using the input provided. Return the response in a stream.

For more information about invoking models, see Using the API in the Bedrock User Guide.

For an example request and response, see Examples (after the Errors section).

" + "InvokeModel": "

Invokes the specified Bedrock model to run inference using the input provided in the request body. You use InvokeModel to run inference for text models, image models, and embedding models.

For more information, see Run inference in the Bedrock User Guide.

For example requests, see Examples (after the Errors section).

", + "InvokeModelWithResponseStream": "

Invoke the specified Bedrock model to run inference using the input provided. Return the response in a stream.

For more information, see Run inference in the Bedrock User Guide.

For an example request and response, see Examples (after the Errors section).

" }, "shapes": { "AccessDeniedException": { @@ -82,6 +82,7 @@ "ModelTimeoutException": { "base": "

The request took too long to process. Processing time exceeded the model timeout length.

", "refs": { + "ResponseStream$modelTimeoutException": null } }, "NonBlankString": { diff --git a/models/apis/bedrock/2023-04-20/api-2.json b/models/apis/bedrock/2023-04-20/api-2.json index adb3a226b54..24c151b078d 100644 --- a/models/apis/bedrock/2023-04-20/api-2.json +++ b/models/apis/bedrock/2023-04-20/api-2.json @@ -33,6 +33,26 @@ ], "idempotent":true }, + "CreateProvisionedModelThroughput":{ + "name":"CreateProvisionedModelThroughput", + "http":{ + "method":"POST", + "requestUri":"/provisioned-model-throughput", + "responseCode":201 + }, + "input":{"shape":"CreateProvisionedModelThroughputRequest"}, + "output":{"shape":"CreateProvisionedModelThroughputResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"InternalServerException"}, + {"shape":"TooManyTagsException"}, + {"shape":"ServiceQuotaExceededException"}, + {"shape":"ThrottlingException"} + ], + "idempotent":true + }, "DeleteCustomModel":{ "name":"DeleteCustomModel", "http":{ @@ -68,6 +88,25 @@ ], "idempotent":true }, + "DeleteProvisionedModelThroughput":{ + "name":"DeleteProvisionedModelThroughput", + "http":{ + "method":"DELETE", + "requestUri":"/provisioned-model-throughput/{provisionedModelId}", + "responseCode":200 + }, + "input":{"shape":"DeleteProvisionedModelThroughputRequest"}, + "output":{"shape":"DeleteProvisionedModelThroughputResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"ConflictException"}, + {"shape":"InternalServerException"}, + {"shape":"ThrottlingException"} + ], + "idempotent":true + }, "GetCustomModel":{ "name":"GetCustomModel", "http":{ @@ -134,6 +173,23 @@ {"shape":"ThrottlingException"} ] }, + "GetProvisionedModelThroughput":{ + "name":"GetProvisionedModelThroughput", + "http":{ + "method":"GET", + "requestUri":"/provisioned-model-throughput/{provisionedModelId}", + "responseCode":200 + }, + "input":{"shape":"GetProvisionedModelThroughputRequest"}, + "output":{"shape":"GetProvisionedModelThroughputResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"InternalServerException"}, + {"shape":"ThrottlingException"} + ] + }, "ListCustomModels":{ "name":"ListCustomModels", "http":{ @@ -182,6 +238,22 @@ {"shape":"ThrottlingException"} ] }, + "ListProvisionedModelThroughputs":{ + "name":"ListProvisionedModelThroughputs", + "http":{ + "method":"GET", + "requestUri":"/provisioned-model-throughputs", + "responseCode":200 + }, + "input":{"shape":"ListProvisionedModelThroughputsRequest"}, + "output":{"shape":"ListProvisionedModelThroughputsResponse"}, + "errors":[ + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"InternalServerException"}, + {"shape":"ThrottlingException"} + ] + }, "ListTagsForResource":{ "name":"ListTagsForResource", "http":{ @@ -269,6 +341,24 @@ {"shape":"InternalServerException"}, {"shape":"ThrottlingException"} ] + }, + "UpdateProvisionedModelThroughput":{ + "name":"UpdateProvisionedModelThroughput", + "http":{ + "method":"PATCH", + "requestUri":"/provisioned-model-throughput/{provisionedModelId}", + "responseCode":200 + }, + "input":{"shape":"UpdateProvisionedModelThroughputRequest"}, + "output":{"shape":"UpdateProvisionedModelThroughputResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"InternalServerException"}, + {"shape":"ThrottlingException"} + ], + "idempotent":true } }, "shapes":{ @@ -287,13 +377,13 @@ "type":"string", "max":2048, "min":1, - "pattern":"^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})|(([0-9a-zA-Z][_-]?)+)$" + "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2})))|([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})|(([0-9a-zA-Z][_-]?)+)" }, "BedrockModelId":{ "type":"string", "max":140, "min":0, - "pattern":"^[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}(/[a-z0-9]{12}|)$" + "pattern":"[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}(/[a-z0-9]{12}|)" }, "Boolean":{ "type":"boolean", @@ -303,7 +393,7 @@ "type":"string", "max":20, "min":1, - "pattern":"^.*$" + "pattern":".*" }, "BucketName":{ "type":"string", @@ -317,11 +407,18 @@ "roleArn" ], "members":{ - "largeDataDeliveryS3Config":{"shape":"S3Config"}, "logGroupName":{"shape":"LogGroupName"}, - "roleArn":{"shape":"RoleArn"} + "roleArn":{"shape":"RoleArn"}, + "largeDataDeliveryS3Config":{"shape":"S3Config"} } }, + "CommitmentDuration":{ + "type":"string", + "enum":[ + "OneMonth", + "SixMonths" + ] + }, "ConflictException":{ "type":"structure", "members":{ @@ -336,30 +433,30 @@ "CreateModelCustomizationJobRequest":{ "type":"structure", "required":[ - "baseModelIdentifier", - "customModelName", - "hyperParameters", "jobName", - "outputDataConfig", + "customModelName", "roleArn", - "trainingDataConfig" + "baseModelIdentifier", + "trainingDataConfig", + "outputDataConfig", + "hyperParameters" ], "members":{ - "baseModelIdentifier":{"shape":"BaseModelIdentifier"}, + "jobName":{"shape":"JobName"}, + "customModelName":{"shape":"CustomModelName"}, + "roleArn":{"shape":"RoleArn"}, "clientRequestToken":{ "shape":"IdempotencyToken", "idempotencyToken":true }, + "baseModelIdentifier":{"shape":"BaseModelIdentifier"}, "customModelKmsKeyId":{"shape":"KmsKeyId"}, - "customModelName":{"shape":"CustomModelName"}, - "customModelTags":{"shape":"TagList"}, - "hyperParameters":{"shape":"ModelCustomizationHyperParameters"}, - "jobName":{"shape":"JobName"}, "jobTags":{"shape":"TagList"}, - "outputDataConfig":{"shape":"OutputDataConfig"}, - "roleArn":{"shape":"RoleArn"}, + "customModelTags":{"shape":"TagList"}, "trainingDataConfig":{"shape":"TrainingDataConfig"}, "validationDataConfig":{"shape":"ValidationDataConfig"}, + "outputDataConfig":{"shape":"OutputDataConfig"}, + "hyperParameters":{"shape":"ModelCustomizationHyperParameters"}, "vpcConfig":{"shape":"VpcConfig"} } }, @@ -370,33 +467,59 @@ "jobArn":{"shape":"ModelCustomizationJobArn"} } }, + "CreateProvisionedModelThroughputRequest":{ + "type":"structure", + "required":[ + "modelUnits", + "provisionedModelName", + "modelId" + ], + "members":{ + "clientRequestToken":{ + "shape":"IdempotencyToken", + "idempotencyToken":true + }, + "modelUnits":{"shape":"PositiveInteger"}, + "provisionedModelName":{"shape":"ProvisionedModelName"}, + "modelId":{"shape":"ModelIdentifier"}, + "commitmentDuration":{"shape":"CommitmentDuration"}, + "tags":{"shape":"TagList"} + } + }, + "CreateProvisionedModelThroughputResponse":{ + "type":"structure", + "required":["provisionedModelArn"], + "members":{ + "provisionedModelArn":{"shape":"ProvisionedModelArn"} + } + }, "CustomModelArn":{ "type":"string", "max":1011, "min":20, - "pattern":"^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}/[a-z0-9]{12}$" + "pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}/[a-z0-9]{12}" }, "CustomModelName":{ "type":"string", "max":63, "min":1, - "pattern":"^([0-9a-zA-Z][_-]?)+$" + "pattern":"([0-9a-zA-Z][_-]?)+" }, "CustomModelSummary":{ "type":"structure", "required":[ - "baseModelArn", - "baseModelName", - "creationTime", "modelArn", - "modelName" + "modelName", + "creationTime", + "baseModelArn", + "baseModelName" ], "members":{ - "baseModelArn":{"shape":"ModelArn"}, - "baseModelName":{"shape":"ModelName"}, - "creationTime":{"shape":"Timestamp"}, "modelArn":{"shape":"CustomModelArn"}, - "modelName":{"shape":"CustomModelName"} + "modelName":{"shape":"CustomModelName"}, + "creationTime":{"shape":"Timestamp"}, + "baseModelArn":{"shape":"ModelArn"}, + "baseModelName":{"shape":"ModelName"} } }, "CustomModelSummaryList":{ @@ -429,6 +552,22 @@ "members":{ } }, + "DeleteProvisionedModelThroughputRequest":{ + "type":"structure", + "required":["provisionedModelId"], + "members":{ + "provisionedModelId":{ + "shape":"ProvisionedModelId", + "location":"uri", + "locationName":"provisionedModelId" + } + } + }, + "DeleteProvisionedModelThroughputResponse":{ + "type":"structure", + "members":{ + } + }, "ErrorMessage":{ "type":"string", "max":2048, @@ -446,7 +585,7 @@ }, "FoundationModelArn":{ "type":"string", - "pattern":"^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}::foundation-model/[a-z0-9-]{1,63}[.]{1}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}$" + "pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}::foundation-model/[a-z0-9-]{1,63}[.]{1}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}" }, "FoundationModelDetails":{ "type":"structure", @@ -455,15 +594,15 @@ "modelId" ], "members":{ - "customizationsSupported":{"shape":"ModelCustomizationList"}, - "inferenceTypesSupported":{"shape":"InferenceTypeList"}, - "inputModalities":{"shape":"ModelModalityList"}, "modelArn":{"shape":"FoundationModelArn"}, "modelId":{"shape":"BedrockModelId"}, "modelName":{"shape":"BrandedName"}, - "outputModalities":{"shape":"ModelModalityList"}, "providerName":{"shape":"BrandedName"}, - "responseStreamingSupported":{"shape":"Boolean"} + "inputModalities":{"shape":"ModelModalityList"}, + "outputModalities":{"shape":"ModelModalityList"}, + "responseStreamingSupported":{"shape":"Boolean"}, + "customizationsSupported":{"shape":"ModelCustomizationList"}, + "inferenceTypesSupported":{"shape":"InferenceTypeList"} } }, "FoundationModelSummary":{ @@ -473,15 +612,15 @@ "modelId" ], "members":{ - "customizationsSupported":{"shape":"ModelCustomizationList"}, - "inferenceTypesSupported":{"shape":"InferenceTypeList"}, - "inputModalities":{"shape":"ModelModalityList"}, "modelArn":{"shape":"FoundationModelArn"}, "modelId":{"shape":"BedrockModelId"}, "modelName":{"shape":"BrandedName"}, - "outputModalities":{"shape":"ModelModalityList"}, "providerName":{"shape":"BrandedName"}, - "responseStreamingSupported":{"shape":"Boolean"} + "inputModalities":{"shape":"ModelModalityList"}, + "outputModalities":{"shape":"ModelModalityList"}, + "responseStreamingSupported":{"shape":"Boolean"}, + "customizationsSupported":{"shape":"ModelCustomizationList"}, + "inferenceTypesSupported":{"shape":"InferenceTypeList"} } }, "FoundationModelSummaryList":{ @@ -502,28 +641,28 @@ "GetCustomModelResponse":{ "type":"structure", "required":[ - "baseModelArn", - "creationTime", - "jobArn", "modelArn", "modelName", + "jobArn", + "baseModelArn", + "trainingDataConfig", "outputDataConfig", - "trainingDataConfig" + "creationTime" ], "members":{ - "baseModelArn":{"shape":"ModelArn"}, - "creationTime":{"shape":"Timestamp"}, - "hyperParameters":{"shape":"ModelCustomizationHyperParameters"}, - "jobArn":{"shape":"ModelCustomizationJobArn"}, - "jobName":{"shape":"JobName"}, "modelArn":{"shape":"ModelArn"}, - "modelKmsKeyArn":{"shape":"KmsKeyArn"}, "modelName":{"shape":"CustomModelName"}, - "outputDataConfig":{"shape":"OutputDataConfig"}, + "jobName":{"shape":"JobName"}, + "jobArn":{"shape":"ModelCustomizationJobArn"}, + "baseModelArn":{"shape":"ModelArn"}, + "modelKmsKeyArn":{"shape":"KmsKeyArn"}, + "hyperParameters":{"shape":"ModelCustomizationHyperParameters"}, "trainingDataConfig":{"shape":"TrainingDataConfig"}, - "trainingMetrics":{"shape":"TrainingMetrics"}, "validationDataConfig":{"shape":"ValidationDataConfig"}, - "validationMetrics":{"shape":"ValidationMetrics"} + "outputDataConfig":{"shape":"OutputDataConfig"}, + "trainingMetrics":{"shape":"TrainingMetrics"}, + "validationMetrics":{"shape":"ValidationMetrics"}, + "creationTime":{"shape":"Timestamp"} } }, "GetFoundationModelRequest":{ @@ -557,36 +696,36 @@ "GetModelCustomizationJobResponse":{ "type":"structure", "required":[ - "baseModelArn", - "creationTime", - "hyperParameters", "jobArn", "jobName", - "outputDataConfig", "outputModelName", "roleArn", + "creationTime", + "baseModelArn", + "hyperParameters", "trainingDataConfig", - "validationDataConfig" + "validationDataConfig", + "outputDataConfig" ], "members":{ - "baseModelArn":{"shape":"FoundationModelArn"}, - "clientRequestToken":{"shape":"IdempotencyToken"}, - "creationTime":{"shape":"Timestamp"}, - "endTime":{"shape":"Timestamp"}, - "failureMessage":{"shape":"ErrorMessage"}, - "hyperParameters":{"shape":"ModelCustomizationHyperParameters"}, "jobArn":{"shape":"ModelCustomizationJobArn"}, "jobName":{"shape":"JobName"}, - "lastModifiedTime":{"shape":"Timestamp"}, - "outputDataConfig":{"shape":"OutputDataConfig"}, - "outputModelArn":{"shape":"CustomModelArn"}, - "outputModelKmsKeyArn":{"shape":"KmsKeyArn"}, "outputModelName":{"shape":"CustomModelName"}, + "outputModelArn":{"shape":"CustomModelArn"}, + "clientRequestToken":{"shape":"IdempotencyToken"}, "roleArn":{"shape":"RoleArn"}, "status":{"shape":"ModelCustomizationJobStatus"}, + "failureMessage":{"shape":"ErrorMessage"}, + "creationTime":{"shape":"Timestamp"}, + "lastModifiedTime":{"shape":"Timestamp"}, + "endTime":{"shape":"Timestamp"}, + "baseModelArn":{"shape":"FoundationModelArn"}, + "hyperParameters":{"shape":"ModelCustomizationHyperParameters"}, "trainingDataConfig":{"shape":"TrainingDataConfig"}, - "trainingMetrics":{"shape":"TrainingMetrics"}, "validationDataConfig":{"shape":"ValidationDataConfig"}, + "outputDataConfig":{"shape":"OutputDataConfig"}, + "outputModelKmsKeyArn":{"shape":"KmsKeyArn"}, + "trainingMetrics":{"shape":"TrainingMetrics"}, "validationMetrics":{"shape":"ValidationMetrics"}, "vpcConfig":{"shape":"VpcConfig"} } @@ -602,11 +741,52 @@ "loggingConfig":{"shape":"LoggingConfig"} } }, + "GetProvisionedModelThroughputRequest":{ + "type":"structure", + "required":["provisionedModelId"], + "members":{ + "provisionedModelId":{ + "shape":"ProvisionedModelId", + "location":"uri", + "locationName":"provisionedModelId" + } + } + }, + "GetProvisionedModelThroughputResponse":{ + "type":"structure", + "required":[ + "modelUnits", + "desiredModelUnits", + "provisionedModelName", + "provisionedModelArn", + "modelArn", + "desiredModelArn", + "foundationModelArn", + "status", + "creationTime", + "lastModifiedTime" + ], + "members":{ + "modelUnits":{"shape":"PositiveInteger"}, + "desiredModelUnits":{"shape":"PositiveInteger"}, + "provisionedModelName":{"shape":"ProvisionedModelName"}, + "provisionedModelArn":{"shape":"ProvisionedModelArn"}, + "modelArn":{"shape":"ModelArn"}, + "desiredModelArn":{"shape":"ModelArn"}, + "foundationModelArn":{"shape":"FoundationModelArn"}, + "status":{"shape":"ProvisionedModelStatus"}, + "creationTime":{"shape":"Timestamp"}, + "lastModifiedTime":{"shape":"Timestamp"}, + "failureMessage":{"shape":"ErrorMessage"}, + "commitmentDuration":{"shape":"CommitmentDuration"}, + "commitmentExpirationTime":{"shape":"Timestamp"} + } + }, "IdempotencyToken":{ "type":"string", "max":256, "min":1, - "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9])*$" + "pattern":"[a-zA-Z0-9](-*[a-zA-Z0-9])*" }, "InferenceType":{ "type":"string", @@ -632,7 +812,7 @@ "type":"string", "max":63, "min":1, - "pattern":"^[a-zA-Z0-9](-*[a-zA-Z0-9\\+\\-\\.])*$" + "pattern":"[a-zA-Z0-9](-*[a-zA-Z0-9\\+\\-\\.])*" }, "KeyPrefix":{ "type":"string", @@ -643,31 +823,36 @@ "type":"string", "max":2048, "min":1, - "pattern":"^arn:aws(-[^:]+)?:kms:[a-zA-Z0-9-]*:[0-9]{12}:key/[a-zA-Z0-9-]{36}$" + "pattern":"arn:aws(-[^:]+)?:kms:[a-zA-Z0-9-]*:[0-9]{12}:key/[a-zA-Z0-9-]{36}" }, "KmsKeyId":{ "type":"string", "max":2048, "min":1, - "pattern":"^arn:aws(-[^:]+)?:kms:[a-zA-Z0-9-]*:[0-9]{12}:((key/[a-zA-Z0-9-]{36})|(alias/[a-zA-Z0-9-_/]+))$" + "pattern":"arn:aws(-[^:]+)?:kms:[a-zA-Z0-9-]*:[0-9]{12}:((key/[a-zA-Z0-9-]{36})|(alias/[a-zA-Z0-9-_/]+))" }, "ListCustomModelsRequest":{ "type":"structure", "members":{ - "baseModelArnEquals":{ - "shape":"ModelArn", + "creationTimeBefore":{ + "shape":"Timestamp", "location":"querystring", - "locationName":"baseModelArnEquals" + "locationName":"creationTimeBefore" }, "creationTimeAfter":{ "shape":"Timestamp", "location":"querystring", "locationName":"creationTimeAfter" }, - "creationTimeBefore":{ - "shape":"Timestamp", + "nameContains":{ + "shape":"CustomModelName", "location":"querystring", - "locationName":"creationTimeBefore" + "locationName":"nameContains" + }, + "baseModelArnEquals":{ + "shape":"ModelArn", + "location":"querystring", + "locationName":"baseModelArnEquals" }, "foundationModelArnEquals":{ "shape":"FoundationModelArn", @@ -679,11 +864,6 @@ "location":"querystring", "locationName":"maxResults" }, - "nameContains":{ - "shape":"CustomModelName", - "location":"querystring", - "locationName":"nameContains" - }, "nextToken":{ "shape":"PaginationToken", "location":"querystring", @@ -704,32 +884,32 @@ "ListCustomModelsResponse":{ "type":"structure", "members":{ - "modelSummaries":{"shape":"CustomModelSummaryList"}, - "nextToken":{"shape":"PaginationToken"} + "nextToken":{"shape":"PaginationToken"}, + "modelSummaries":{"shape":"CustomModelSummaryList"} } }, "ListFoundationModelsRequest":{ "type":"structure", "members":{ + "byProvider":{ + "shape":"Provider", + "location":"querystring", + "locationName":"byProvider" + }, "byCustomizationType":{ "shape":"ModelCustomization", "location":"querystring", "locationName":"byCustomizationType" }, - "byInferenceType":{ - "shape":"InferenceType", - "location":"querystring", - "locationName":"byInferenceType" - }, "byOutputModality":{ "shape":"ModelModality", "location":"querystring", "locationName":"byOutputModality" }, - "byProvider":{ - "shape":"Provider", + "byInferenceType":{ + "shape":"InferenceType", "location":"querystring", - "locationName":"byProvider" + "locationName":"byInferenceType" } } }, @@ -752,16 +932,21 @@ "location":"querystring", "locationName":"creationTimeBefore" }, - "maxResults":{ - "shape":"MaxResults", + "statusEquals":{ + "shape":"FineTuningJobStatus", "location":"querystring", - "locationName":"maxResults" + "locationName":"statusEquals" }, "nameContains":{ "shape":"JobName", "location":"querystring", "locationName":"nameContains" }, + "maxResults":{ + "shape":"MaxResults", + "location":"querystring", + "locationName":"maxResults" + }, "nextToken":{ "shape":"PaginationToken", "location":"querystring", @@ -776,19 +961,71 @@ "shape":"SortOrder", "location":"querystring", "locationName":"sortOrder" + } + } + }, + "ListModelCustomizationJobsResponse":{ + "type":"structure", + "members":{ + "nextToken":{"shape":"PaginationToken"}, + "modelCustomizationJobSummaries":{"shape":"ModelCustomizationJobSummaries"} + } + }, + "ListProvisionedModelThroughputsRequest":{ + "type":"structure", + "members":{ + "creationTimeAfter":{ + "shape":"Timestamp", + "location":"querystring", + "locationName":"creationTimeAfter" + }, + "creationTimeBefore":{ + "shape":"Timestamp", + "location":"querystring", + "locationName":"creationTimeBefore" }, "statusEquals":{ - "shape":"FineTuningJobStatus", + "shape":"ProvisionedModelStatus", "location":"querystring", "locationName":"statusEquals" + }, + "modelArnEquals":{ + "shape":"ModelArn", + "location":"querystring", + "locationName":"modelArnEquals" + }, + "nameContains":{ + "shape":"ProvisionedModelName", + "location":"querystring", + "locationName":"nameContains" + }, + "maxResults":{ + "shape":"MaxResults", + "location":"querystring", + "locationName":"maxResults" + }, + "nextToken":{ + "shape":"PaginationToken", + "location":"querystring", + "locationName":"nextToken" + }, + "sortBy":{ + "shape":"SortByProvisionedModels", + "location":"querystring", + "locationName":"sortBy" + }, + "sortOrder":{ + "shape":"SortOrder", + "location":"querystring", + "locationName":"sortOrder" } } }, - "ListModelCustomizationJobsResponse":{ + "ListProvisionedModelThroughputsResponse":{ "type":"structure", "members":{ - "modelCustomizationJobSummaries":{"shape":"ModelCustomizationJobSummaries"}, - "nextToken":{"shape":"PaginationToken"} + "nextToken":{"shape":"PaginationToken"}, + "provisionedModelSummaries":{"shape":"ProvisionedModelSummaries"} } }, "ListTagsForResourceRequest":{ @@ -813,10 +1050,10 @@ "type":"structure", "members":{ "cloudWatchConfig":{"shape":"CloudWatchConfig"}, - "embeddingDataDeliveryEnabled":{"shape":"Boolean"}, - "imageDataDeliveryEnabled":{"shape":"Boolean"}, "s3Config":{"shape":"S3Config"}, - "textDataDeliveryEnabled":{"shape":"Boolean"} + "textDataDeliveryEnabled":{"shape":"Boolean"}, + "imageDataDeliveryEnabled":{"shape":"Boolean"}, + "embeddingDataDeliveryEnabled":{"shape":"Boolean"} } }, "MaxResults":{ @@ -833,7 +1070,7 @@ "type":"string", "max":1011, "min":20, - "pattern":"^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}))$" + "pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/[a-z0-9-]{1,63}[.]{1}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}))" }, "ModelCustomization":{ "type":"string", @@ -848,13 +1085,13 @@ "type":"string", "max":1011, "min":0, - "pattern":"^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:model-customization-job/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}/[a-z0-9]{12}$" + "pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:model-customization-job/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}/[a-z0-9]{12}" }, "ModelCustomizationJobIdentifier":{ "type":"string", "max":1011, "min":0, - "pattern":"^(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:model-customization-job/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}/[a-z0-9]{12})|([a-zA-Z0-9](-*[a-zA-Z0-9\\+\\-\\.])*)$" + "pattern":"(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:model-customization-job/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}/[a-z0-9]{12})|([a-zA-Z0-9](-*[a-zA-Z0-9\\+\\-\\.])*)" }, "ModelCustomizationJobStatus":{ "type":"string", @@ -873,22 +1110,22 @@ "ModelCustomizationJobSummary":{ "type":"structure", "required":[ - "baseModelArn", - "creationTime", "jobArn", + "baseModelArn", "jobName", - "status" + "status", + "creationTime" ], "members":{ - "baseModelArn":{"shape":"ModelArn"}, - "creationTime":{"shape":"Timestamp"}, - "customModelArn":{"shape":"CustomModelArn"}, - "customModelName":{"shape":"CustomModelName"}, - "endTime":{"shape":"Timestamp"}, "jobArn":{"shape":"ModelCustomizationJobArn"}, + "baseModelArn":{"shape":"ModelArn"}, "jobName":{"shape":"JobName"}, + "status":{"shape":"ModelCustomizationJobStatus"}, "lastModifiedTime":{"shape":"Timestamp"}, - "status":{"shape":"ModelCustomizationJobStatus"} + "creationTime":{"shape":"Timestamp"}, + "endTime":{"shape":"Timestamp"}, + "customModelArn":{"shape":"CustomModelArn"}, + "customModelName":{"shape":"CustomModelName"} } }, "ModelCustomizationList":{ @@ -899,7 +1136,7 @@ "type":"string", "max":2048, "min":1, - "pattern":"^(arn:aws(-[^:]+)?:amazon-bedrock:[a-zA-Z0-9-]*:(([0-9]{12})|(aws))?:(custom|built-in)-model/.+)|(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}/[a-z0-9]{12})|(:foundation-model/([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2}))))|(([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2}))|(([0-9a-zA-Z][_-]?)+)$" + "pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:(([0-9]{12}:custom-model/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}(([:][a-z0-9-]{1,63}){0,2})?/[a-z0-9]{12})|(:foundation-model/([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2})))|(([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([.]?[a-z0-9-]{1,63})([:][a-z0-9-]{1,63}){0,2}))|(([0-9a-zA-Z][_-]?)+)" }, "ModelModality":{ "type":"string", @@ -917,11 +1154,11 @@ "type":"string", "max":63, "min":1, - "pattern":"^([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63})$" + "pattern":"([a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63})" }, "NonBlankString":{ "type":"string", - "pattern":"^[\\s\\S]*$" + "pattern":"[\\s\\S]*" }, "OutputDataConfig":{ "type":"structure", @@ -934,11 +1171,72 @@ "type":"string", "max":2048, "min":1, - "pattern":"^\\S*$" + "pattern":"\\S*" + }, + "PositiveInteger":{ + "type":"integer", + "box":true, + "min":1 }, "Provider":{ "type":"string", - "pattern":"^[a-z0-9-]{1,63}$" + "pattern":"[a-z0-9-]{1,63}" + }, + "ProvisionedModelArn":{ + "type":"string", + "pattern":"arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:provisioned-model/[a-z0-9]{12}" + }, + "ProvisionedModelId":{ + "type":"string", + "pattern":"((([0-9a-zA-Z][_-]?)+)|(arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:provisioned-model/[a-z0-9]{12}))" + }, + "ProvisionedModelName":{ + "type":"string", + "max":63, + "min":1, + "pattern":"([0-9a-zA-Z][_-]?)+" + }, + "ProvisionedModelStatus":{ + "type":"string", + "enum":[ + "Creating", + "InService", + "Updating", + "Failed" + ] + }, + "ProvisionedModelSummaries":{ + "type":"list", + "member":{"shape":"ProvisionedModelSummary"} + }, + "ProvisionedModelSummary":{ + "type":"structure", + "required":[ + "provisionedModelName", + "provisionedModelArn", + "modelArn", + "desiredModelArn", + "foundationModelArn", + "modelUnits", + "desiredModelUnits", + "status", + "creationTime", + "lastModifiedTime" + ], + "members":{ + "provisionedModelName":{"shape":"ProvisionedModelName"}, + "provisionedModelArn":{"shape":"ProvisionedModelArn"}, + "modelArn":{"shape":"ModelArn"}, + "desiredModelArn":{"shape":"ModelArn"}, + "foundationModelArn":{"shape":"FoundationModelArn"}, + "modelUnits":{"shape":"PositiveInteger"}, + "desiredModelUnits":{"shape":"PositiveInteger"}, + "status":{"shape":"ProvisionedModelStatus"}, + "commitmentDuration":{"shape":"CommitmentDuration"}, + "commitmentExpirationTime":{"shape":"Timestamp"}, + "creationTime":{"shape":"Timestamp"}, + "lastModifiedTime":{"shape":"Timestamp"} + } }, "PutModelInvocationLoggingConfigurationRequest":{ "type":"structure", @@ -967,7 +1265,7 @@ "type":"string", "max":2048, "min":0, - "pattern":"^arn:aws(-[^:]+)?:iam::([0-9]{12})?:role/.+$" + "pattern":"arn:aws(-[^:]+)?:iam::([0-9]{12})?:role/.+" }, "S3Config":{ "type":"structure", @@ -981,13 +1279,13 @@ "type":"string", "max":1024, "min":1, - "pattern":"^s3://[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9](/.*)?$" + "pattern":"s3://[a-z0-9][\\.\\-a-z0-9]{1,61}[a-z0-9](/.*)?" }, "SecurityGroupId":{ "type":"string", "max":32, "min":0, - "pattern":"^[-0-9a-zA-Z]+$" + "pattern":"[-0-9a-zA-Z]+" }, "SecurityGroupIds":{ "type":"list", @@ -1006,6 +1304,10 @@ }, "exception":true }, + "SortByProvisionedModels":{ + "type":"string", + "enum":["CreationTime"] + }, "SortJobsBy":{ "type":"string", "enum":["CreationTime"] @@ -1042,7 +1344,7 @@ "type":"string", "max":32, "min":0, - "pattern":"^[-0-9a-zA-Z]+$" + "pattern":"[-0-9a-zA-Z]+" }, "SubnetIds":{ "type":"list", @@ -1065,7 +1367,7 @@ "type":"string", "max":128, "min":1, - "pattern":"^[a-zA-Z0-9\\s._:/=+@-]*$" + "pattern":"[a-zA-Z0-9\\s._:/=+@-]*" }, "TagKeyList":{ "type":"list", @@ -1099,13 +1401,13 @@ "type":"string", "max":256, "min":0, - "pattern":"^[a-zA-Z0-9\\s._:/=+@-]*$" + "pattern":"[a-zA-Z0-9\\s._:/=+@-]*" }, "TaggableResourcesArn":{ "type":"string", "max":1011, "min":20, - "pattern":"(^arn:aws(-[^:]+)?:amazon-bedrock:[a-zA-Z0-9-]*:[0-9]{12}:(fine-tuning-job|custom-model)/.+$)|([a-zA-Z0-9][a-zA-Z0-9\\-]*$)|(^arn:aws(|-cn|-us-gov):bedrock:[a-z0-9-]{1,20}:([0-9]{12}|):(fine-tuning-job|model-customization-job|custom-model)/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}(/[a-z0-9]{12})$)|(^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:[0-9]{12}:provisioned-model/[a-z0-9]{12}$)" + "pattern":".*(^[a-zA-Z0-9][a-zA-Z0-9\\-]*$)|(^arn:aws(-[^:]+)?:bedrock:[a-z0-9-]{1,20}:([0-9]{12}|)((:(fine-tuning-job|model-customization-job|custom-model)/[a-z0-9-]{1,63}[.]{1}[a-z0-9-]{1,63}([a-z0-9-]{1,63}[.]){0,2}[a-z0-9-]{1,63}([:][a-z0-9-]{1,63}){0,2}(/[a-z0-9]{12})$)|(:provisioned-model/[a-z0-9]{12}$))).*" }, "ThrottlingException":{ "type":"structure", @@ -1163,6 +1465,24 @@ "members":{ } }, + "UpdateProvisionedModelThroughputRequest":{ + "type":"structure", + "required":["provisionedModelId"], + "members":{ + "provisionedModelId":{ + "shape":"ProvisionedModelId", + "location":"uri", + "locationName":"provisionedModelId" + }, + "desiredProvisionedModelName":{"shape":"ProvisionedModelName"}, + "desiredModelId":{"shape":"ModelIdentifier"} + } + }, + "UpdateProvisionedModelThroughputResponse":{ + "type":"structure", + "members":{ + } + }, "ValidationDataConfig":{ "type":"structure", "required":["validators"], @@ -1207,12 +1527,12 @@ "VpcConfig":{ "type":"structure", "required":[ - "securityGroupIds", - "subnetIds" + "subnetIds", + "securityGroupIds" ], "members":{ - "securityGroupIds":{"shape":"SecurityGroupIds"}, - "subnetIds":{"shape":"SubnetIds"} + "subnetIds":{"shape":"SubnetIds"}, + "securityGroupIds":{"shape":"SecurityGroupIds"} } } } diff --git a/models/apis/bedrock/2023-04-20/docs-2.json b/models/apis/bedrock/2023-04-20/docs-2.json index 511579e71eb..f37ecaa80e7 100644 --- a/models/apis/bedrock/2023-04-20/docs-2.json +++ b/models/apis/bedrock/2023-04-20/docs-2.json @@ -3,20 +3,25 @@ "service": "

Describes the API operations for creating and managing Bedrock models.

", "operations": { "CreateModelCustomizationJob": "

Creates a fine-tuning job to customize a base model.

You specify the base foundation model and the location of the training data. After the model-customization job completes successfully, your custom model resource will be ready to use. Training data contains input and output text for each record in a JSONL format. Optionally, you can specify validation data in the same format as the training data. Bedrock returns validation loss metrics and output generations after the job completes.

Model-customization jobs are asynchronous and the completion time depends on the base model and the training/validation data size. To monitor a job, use the GetModelCustomizationJob operation to retrieve the job status.

For more information, see Custom models in the Bedrock User Guide.

", + "CreateProvisionedModelThroughput": "

Creates a provisioned throughput with dedicated capacity for a foundation model or a fine-tuned model.

For more information, see Provisioned throughput in the Bedrock User Guide.

", "DeleteCustomModel": "

Deletes a custom model that you created earlier. For more information, see Custom models in the Bedrock User Guide.

", "DeleteModelInvocationLoggingConfiguration": "

Delete the invocation logging.

", + "DeleteProvisionedModelThroughput": "

Deletes a provisioned throughput. For more information, see Provisioned throughput in the Bedrock User Guide.

", "GetCustomModel": "

Get the properties associated with a Bedrock custom model that you have created.For more information, see Custom models in the Bedrock User Guide.

", "GetFoundationModel": "

Get details about a Bedrock foundation model.

", "GetModelCustomizationJob": "

Retrieves the properties associated with a model-customization job, including the status of the job. For more information, see Custom models in the Bedrock User Guide.

", "GetModelInvocationLoggingConfiguration": "

Get the current configuration values for model invocation logging.

", + "GetProvisionedModelThroughput": "

Get details for a provisioned throughput. For more information, see Provisioned throughput in the Bedrock User Guide.

", "ListCustomModels": "

Returns a list of the custom models that you have created with the CreateModelCustomizationJob operation.

For more information, see Custom models in the Bedrock User Guide.

", "ListFoundationModels": "

List of Bedrock foundation models that you can use. For more information, see Foundation models in the Bedrock User Guide.

", "ListModelCustomizationJobs": "

Returns a list of model customization jobs that you have submitted. You can filter the jobs to return based on one or more criteria.

For more information, see Custom models in the Bedrock User Guide.

", + "ListProvisionedModelThroughputs": "

List the provisioned capacities. For more information, see Provisioned throughput in the Bedrock User Guide.

", "ListTagsForResource": "

List the tags associated with the specified resource.

For more information, see Tagging resources in the Bedrock User Guide.

", "PutModelInvocationLoggingConfiguration": "

Set the configuration values for model invocation logging.

", "StopModelCustomizationJob": "

Stops an active model customization job. For more information, see Custom models in the Bedrock User Guide.

", "TagResource": "

Associate tags with a resource. For more information, see Tagging resources in the Bedrock User Guide.

", - "UntagResource": "

Remove one or more tags from a resource. For more information, see Tagging resources in the Bedrock User Guide.

" + "UntagResource": "

Remove one or more tags from a resource. For more information, see Tagging resources in the Bedrock User Guide.

", + "UpdateProvisionedModelThroughput": "

Update a provisioned throughput. For more information, see Provisioned throughput in the Bedrock User Guide.

" }, "shapes": { "AccessDeniedException": { @@ -42,9 +47,9 @@ "refs": { "FoundationModelDetails$responseStreamingSupported": "

Indicates whether the model supports streaming.

", "FoundationModelSummary$responseStreamingSupported": "

Indicates whether the model supports streaming.

", - "LoggingConfig$embeddingDataDeliveryEnabled": "

Set to include embeddings data in the log delivery.

", + "LoggingConfig$textDataDeliveryEnabled": "

Set to include text data in the log delivery.

", "LoggingConfig$imageDataDeliveryEnabled": "

Set to include image data in the log delivery.

", - "LoggingConfig$textDataDeliveryEnabled": "

Set to include text data in the log delivery.

" + "LoggingConfig$embeddingDataDeliveryEnabled": "

Set to include embeddings data in the log delivery.

" } }, "BrandedName": { @@ -68,6 +73,14 @@ "LoggingConfig$cloudWatchConfig": "

CloudWatch logging configuration.

" } }, + "CommitmentDuration": { + "base": null, + "refs": { + "CreateProvisionedModelThroughputRequest$commitmentDuration": "

Commitment duration requested for the provisioned throughput.

", + "GetProvisionedModelThroughputResponse$commitmentDuration": "

Commitment duration of the provisioned throughput.

", + "ProvisionedModelSummary$commitmentDuration": "

Commitment duration for the provisioned throughput.

" + } + }, "ConflictException": { "base": "

Error occurred because of a conflict while performing an operation.

", "refs": { @@ -83,6 +96,16 @@ "refs": { } }, + "CreateProvisionedModelThroughputRequest": { + "base": null, + "refs": { + } + }, + "CreateProvisionedModelThroughputResponse": { + "base": null, + "refs": { + } + }, "CustomModelArn": { "base": null, "refs": { @@ -134,10 +157,21 @@ "refs": { } }, + "DeleteProvisionedModelThroughputRequest": { + "base": null, + "refs": { + } + }, + "DeleteProvisionedModelThroughputResponse": { + "base": null, + "refs": { + } + }, "ErrorMessage": { "base": null, "refs": { - "GetModelCustomizationJobResponse$failureMessage": "

Information about why the job failed.

" + "GetModelCustomizationJobResponse$failureMessage": "

Information about why the job failed.

", + "GetProvisionedModelThroughputResponse$failureMessage": "

Failure message for any issues that the create operation encounters.

" } }, "FineTuningJobStatus": { @@ -152,7 +186,9 @@ "FoundationModelDetails$modelArn": "

The model ARN.

", "FoundationModelSummary$modelArn": "

The ARN of the foundation model.

", "GetModelCustomizationJobResponse$baseModelArn": "

ARN of the base model.

", - "ListCustomModelsRequest$foundationModelArnEquals": "

Return custom models only if the foundation model ARN matches this parameter.

" + "GetProvisionedModelThroughputResponse$foundationModelArn": "

ARN of the foundation model.

", + "ListCustomModelsRequest$foundationModelArnEquals": "

Return custom models only if the foundation model ARN matches this parameter.

", + "ProvisionedModelSummary$foundationModelArn": "

Foundation model ARN.

" } }, "FoundationModelDetails": { @@ -213,10 +249,21 @@ "refs": { } }, + "GetProvisionedModelThroughputRequest": { + "base": null, + "refs": { + } + }, + "GetProvisionedModelThroughputResponse": { + "base": null, + "refs": { + } + }, "IdempotencyToken": { "base": null, "refs": { "CreateModelCustomizationJobRequest$clientRequestToken": "

Unique token value that you can provide. The GetModelCustomizationJob response includes the same token value.

", + "CreateProvisionedModelThroughputRequest$clientRequestToken": "

Unique token value that you can provide. If this token matches a previous request, Bedrock ignores the request, but does not return an error.

", "GetModelCustomizationJobResponse$clientRequestToken": "

The token that you specified in the CreateCustomizationJob request.

" } }, @@ -298,6 +345,16 @@ "refs": { } }, + "ListProvisionedModelThroughputsRequest": { + "base": null, + "refs": { + } + }, + "ListProvisionedModelThroughputsResponse": { + "base": null, + "refs": { + } + }, "ListTagsForResourceRequest": { "base": null, "refs": { @@ -325,7 +382,8 @@ "base": null, "refs": { "ListCustomModelsRequest$maxResults": "

Maximum number of results to return in the response.

", - "ListModelCustomizationJobsRequest$maxResults": "

Maximum number of results to return in the response.

" + "ListModelCustomizationJobsRequest$maxResults": "

Maximum number of results to return in the response.

", + "ListProvisionedModelThroughputsRequest$maxResults": "

THe maximum number of results to return in the response.

" } }, "MetricFloat": { @@ -339,10 +397,15 @@ "base": null, "refs": { "CustomModelSummary$baseModelArn": "

The base model ARN.

", - "GetCustomModelResponse$baseModelArn": "

ARN of the base model.

", "GetCustomModelResponse$modelArn": "

ARN associated with this model.

", + "GetCustomModelResponse$baseModelArn": "

ARN of the base model.

", + "GetProvisionedModelThroughputResponse$modelArn": "

The ARN or name of the model associated with this provisioned throughput.

", + "GetProvisionedModelThroughputResponse$desiredModelArn": "

The ARN of the new model to asssociate with this provisioned throughput.

", "ListCustomModelsRequest$baseModelArnEquals": "

Return custom models only if the base model ARN matches this parameter.

", - "ModelCustomizationJobSummary$baseModelArn": "

ARN of the base model.

" + "ListProvisionedModelThroughputsRequest$modelArnEquals": "

Return the list of provisioned capacities where their model ARN is equal to this parameter.

", + "ModelCustomizationJobSummary$baseModelArn": "

ARN of the base model.

", + "ProvisionedModelSummary$modelArn": "

The ARN of the model associated with this provisioned throughput.

", + "ProvisionedModelSummary$desiredModelArn": "

Desired model ARN.

" } }, "ModelCustomization": { @@ -405,9 +468,11 @@ "ModelIdentifier": { "base": null, "refs": { + "CreateProvisionedModelThroughputRequest$modelId": "

Name or ARN of the model to associate with this provisioned throughput.

", "DeleteCustomModelRequest$modelIdentifier": "

Name of the model to delete.

", "GetCustomModelRequest$modelIdentifier": "

Name or ARN of the custom model.

", - "GetFoundationModelRequest$modelIdentifier": "

The model identifier.

" + "GetFoundationModelRequest$modelIdentifier": "

The model identifier.

", + "UpdateProvisionedModelThroughputRequest$desiredModelId": "

The ARN of the new model to associate with this provisioned throughput.

" } }, "ModelModality": { @@ -459,7 +524,19 @@ "ListCustomModelsRequest$nextToken": "

Continuation token from the previous response, for Bedrock to list the next set of results.

", "ListCustomModelsResponse$nextToken": "

Continuation token for the next request to list the next set of results.

", "ListModelCustomizationJobsRequest$nextToken": "

Continuation token from the previous response, for Bedrock to list the next set of results.

", - "ListModelCustomizationJobsResponse$nextToken": "

Page continuation token to use in the next request.

" + "ListModelCustomizationJobsResponse$nextToken": "

Page continuation token to use in the next request.

", + "ListProvisionedModelThroughputsRequest$nextToken": "

Continuation token from the previous response, for Bedrock to list the next set of results.

", + "ListProvisionedModelThroughputsResponse$nextToken": "

Continuation token for the next request to list the next set of results.

" + } + }, + "PositiveInteger": { + "base": null, + "refs": { + "CreateProvisionedModelThroughputRequest$modelUnits": "

Number of model units to allocate.

", + "GetProvisionedModelThroughputResponse$modelUnits": "

The current number of model units requested to be available for this provisioned throughput.

", + "GetProvisionedModelThroughputResponse$desiredModelUnits": "

The desired number of model units that was requested to be available for this provisioned throughput.

", + "ProvisionedModelSummary$modelUnits": "

The number of model units allocated.

", + "ProvisionedModelSummary$desiredModelUnits": "

Desired model units.

" } }, "Provider": { @@ -468,6 +545,52 @@ "ListFoundationModelsRequest$byProvider": "

A Bedrock model provider.

" } }, + "ProvisionedModelArn": { + "base": null, + "refs": { + "CreateProvisionedModelThroughputResponse$provisionedModelArn": "

The ARN for this provisioned throughput.

", + "GetProvisionedModelThroughputResponse$provisionedModelArn": "

The ARN of the provisioned throughput.

", + "ProvisionedModelSummary$provisionedModelArn": "

The ARN of the provisioned throughput.

" + } + }, + "ProvisionedModelId": { + "base": null, + "refs": { + "DeleteProvisionedModelThroughputRequest$provisionedModelId": "

The ARN or name of the provisioned throughput.

", + "GetProvisionedModelThroughputRequest$provisionedModelId": "

The ARN or name of the provisioned throughput.

", + "UpdateProvisionedModelThroughputRequest$provisionedModelId": "

The ARN or name of the provisioned throughput to update.

" + } + }, + "ProvisionedModelName": { + "base": null, + "refs": { + "CreateProvisionedModelThroughputRequest$provisionedModelName": "

Unique name for this provisioned throughput.

", + "GetProvisionedModelThroughputResponse$provisionedModelName": "

The name of the provisioned throughput.

", + "ListProvisionedModelThroughputsRequest$nameContains": "

Return the list of provisioned capacities if their name contains these characters.

", + "ProvisionedModelSummary$provisionedModelName": "

The name of the provisioned throughput.

", + "UpdateProvisionedModelThroughputRequest$desiredProvisionedModelName": "

The new name for this provisioned throughput.

" + } + }, + "ProvisionedModelStatus": { + "base": null, + "refs": { + "GetProvisionedModelThroughputResponse$status": "

Status of the provisioned throughput.

", + "ListProvisionedModelThroughputsRequest$statusEquals": "

Return the list of provisioned capacities that match the specified status.

", + "ProvisionedModelSummary$status": "

Status of the provisioned throughput.

" + } + }, + "ProvisionedModelSummaries": { + "base": null, + "refs": { + "ListProvisionedModelThroughputsResponse$provisionedModelSummaries": "

List of summaries, one for each provisioned throughput in the response.

" + } + }, + "ProvisionedModelSummary": { + "base": "

Set of fields associated with a provisioned throughput.

", + "refs": { + "ProvisionedModelSummaries$member": null + } + }, "PutModelInvocationLoggingConfigurationRequest": { "base": null, "refs": { @@ -523,6 +646,12 @@ "refs": { } }, + "SortByProvisionedModels": { + "base": null, + "refs": { + "ListProvisionedModelThroughputsRequest$sortBy": "

The field to sort by in the returned list of provisioned capacities.

" + } + }, "SortJobsBy": { "base": null, "refs": { @@ -539,7 +668,8 @@ "base": null, "refs": { "ListCustomModelsRequest$sortOrder": "

The sort order of the results.

", - "ListModelCustomizationJobsRequest$sortOrder": "

The sort order of the results.

" + "ListModelCustomizationJobsRequest$sortOrder": "

The sort order of the results.

", + "ListProvisionedModelThroughputsRequest$sortOrder": "

The sort order of the results.

" } }, "StopModelCustomizationJobRequest": { @@ -593,8 +723,9 @@ "TagList": { "base": null, "refs": { - "CreateModelCustomizationJobRequest$customModelTags": "

Assign tags to the custom model.

", "CreateModelCustomizationJobRequest$jobTags": "

Assign tags to the job.

", + "CreateModelCustomizationJobRequest$customModelTags": "

Assign tags to the custom model.

", + "CreateProvisionedModelThroughputRequest$tags": "

Tags to associate with this provisioned throughput.

", "ListTagsForResourceResponse$tags": "

An array of the tags associated with this resource.

", "TagResourceRequest$tags": "

Tags to associate with the resource.

" } @@ -635,15 +766,23 @@ "CustomModelSummary$creationTime": "

Creation time of the model.

", "GetCustomModelResponse$creationTime": "

Creation time of the model.

", "GetModelCustomizationJobResponse$creationTime": "

Time that the resource was created.

", - "GetModelCustomizationJobResponse$endTime": "

Time that the resource transitioned to terminal state.

", "GetModelCustomizationJobResponse$lastModifiedTime": "

Time that the resource was last modified.

", - "ListCustomModelsRequest$creationTimeAfter": "

Return custom models created after the specified time.

", + "GetModelCustomizationJobResponse$endTime": "

Time that the resource transitioned to terminal state.

", + "GetProvisionedModelThroughputResponse$creationTime": "

The timestamp of the creation time for this provisioned throughput.

", + "GetProvisionedModelThroughputResponse$lastModifiedTime": "

The timestamp of the last modified time of this provisioned throughput.

", + "GetProvisionedModelThroughputResponse$commitmentExpirationTime": "

Commitment expiration time for the provisioned throughput.

", "ListCustomModelsRequest$creationTimeBefore": "

Return custom models created before the specified time.

", + "ListCustomModelsRequest$creationTimeAfter": "

Return custom models created after the specified time.

", "ListModelCustomizationJobsRequest$creationTimeAfter": "

Return customization jobs created after the specified time.

", "ListModelCustomizationJobsRequest$creationTimeBefore": "

Return customization jobs created before the specified time.

", + "ListProvisionedModelThroughputsRequest$creationTimeAfter": "

Return provisioned capacities created after the specified time.

", + "ListProvisionedModelThroughputsRequest$creationTimeBefore": "

Return provisioned capacities created before the specified time.

", + "ModelCustomizationJobSummary$lastModifiedTime": "

Time that the customization job was last modified.

", "ModelCustomizationJobSummary$creationTime": "

Creation time of the custom model.

", "ModelCustomizationJobSummary$endTime": "

Time that the customization job ended.

", - "ModelCustomizationJobSummary$lastModifiedTime": "

Time that the customization job was last modified.

" + "ProvisionedModelSummary$commitmentExpirationTime": "

Commitment expiration time for the provisioned throughput.

", + "ProvisionedModelSummary$creationTime": "

The time that this provisioned throughput was created.

", + "ProvisionedModelSummary$lastModifiedTime": "

The time that this provisioned throughput was last modified.

" } }, "TooManyTagsException": { @@ -676,6 +815,16 @@ "refs": { } }, + "UpdateProvisionedModelThroughputRequest": { + "base": null, + "refs": { + } + }, + "UpdateProvisionedModelThroughputResponse": { + "base": null, + "refs": { + } + }, "ValidationDataConfig": { "base": "

Array of up to 10 validators.

", "refs": { diff --git a/models/apis/bedrock/2023-04-20/paginators-1.json b/models/apis/bedrock/2023-04-20/paginators-1.json index 6e21ec33639..e8b0ae033ec 100644 --- a/models/apis/bedrock/2023-04-20/paginators-1.json +++ b/models/apis/bedrock/2023-04-20/paginators-1.json @@ -11,6 +11,12 @@ "output_token": "nextToken", "limit_key": "maxResults", "result_key": "modelCustomizationJobSummaries" + }, + "ListProvisionedModelThroughputs": { + "input_token": "nextToken", + "output_token": "nextToken", + "limit_key": "maxResults", + "result_key": "provisionedModelSummaries" } } } diff --git a/models/apis/bedrock/2023-04-20/smoke.json b/models/apis/bedrock/2023-04-20/smoke.json new file mode 100644 index 00000000000..047a1d85ef7 --- /dev/null +++ b/models/apis/bedrock/2023-04-20/smoke.json @@ -0,0 +1,6 @@ +{ + "version": 1, + "defaultRegion": "us-west-2", + "testCases": [ + ] +} \ No newline at end of file diff --git a/models/apis/bedrock/2023-04-20/waiters-2.json b/models/apis/bedrock/2023-04-20/waiters-2.json new file mode 100644 index 00000000000..4b20636aa4c --- /dev/null +++ b/models/apis/bedrock/2023-04-20/waiters-2.json @@ -0,0 +1,5 @@ +{ + "version": 2, + "waiters": { + } +} \ No newline at end of file diff --git a/models/apis/ec2/2016-11-15/api-2.json b/models/apis/ec2/2016-11-15/api-2.json index fb0385c8b69..3a1b6e668a0 100755 --- a/models/apis/ec2/2016-11-15/api-2.json +++ b/models/apis/ec2/2016-11-15/api-2.json @@ -27501,7 +27501,15 @@ "c7i.16xlarge", "c7i.24xlarge", "c7i.48xlarge", - "mac2-m2pro.metal" + "mac2-m2pro.metal", + "r7iz.large", + "r7iz.xlarge", + "r7iz.2xlarge", + "r7iz.4xlarge", + "r7iz.8xlarge", + "r7iz.12xlarge", + "r7iz.16xlarge", + "r7iz.32xlarge" ] }, "InstanceTypeHypervisor":{ diff --git a/models/apis/managedblockchain/2018-09-24/docs-2.json b/models/apis/managedblockchain/2018-09-24/docs-2.json index 851b2629124..95d600748cb 100644 --- a/models/apis/managedblockchain/2018-09-24/docs-2.json +++ b/models/apis/managedblockchain/2018-09-24/docs-2.json @@ -834,7 +834,7 @@ "CreateMemberOutput$MemberId": "

The unique identifier of the member.

", "CreateNetworkOutput$NetworkId": "

The unique identifier for the network.

", "CreateNetworkOutput$MemberId": "

The unique identifier for the first member within the network.

", - "CreateNodeInput$NetworkId": "

The unique identifier of the network for the node.

Ethereum public networks have the following NetworkIds:

", + "CreateNodeInput$NetworkId": "

The unique identifier of the network for the node.

Ethereum public networks have the following NetworkIds:

", "CreateNodeInput$MemberId": "

The unique identifier of the member that owns this node.

Applies only to Hyperledger Fabric.

", "CreateNodeOutput$NodeId": "

The unique identifier of the node.

", "CreateProposalInput$NetworkId": "

The unique identifier of the network for which the proposal is made.

", @@ -843,7 +843,7 @@ "DeleteAccessorInput$AccessorId": "

The unique identifier of the accessor.

", "DeleteMemberInput$NetworkId": "

The unique identifier of the network from which the member is removed.

", "DeleteMemberInput$MemberId": "

The unique identifier of the member to remove.

", - "DeleteNodeInput$NetworkId": "

The unique identifier of the network that the node is on.

Ethereum public networks have the following NetworkIds:

", + "DeleteNodeInput$NetworkId": "

The unique identifier of the network that the node is on.

Ethereum public networks have the following NetworkIds:

", "DeleteNodeInput$MemberId": "

The unique identifier of the member that owns this node.

Applies only to Hyperledger Fabric and is required for Hyperledger Fabric.

", "DeleteNodeInput$NodeId": "

The unique identifier of the node.

", "GetAccessorInput$AccessorId": "

The unique identifier of the accessor.

", @@ -922,7 +922,7 @@ "Member$KmsKeyArn": "

The Amazon Resource Name (ARN) of the customer managed key in Key Management Service (KMS) that the member uses for encryption at rest. If the value of this parameter is \"AWS Owned KMS Key\", the member uses an Amazon Web Services owned KMS key for encryption. This parameter is inherited by the nodes that this member owns.

For more information, see Encryption at Rest in the Amazon Managed Blockchain Hyperledger Fabric Developer Guide.

", "MemberFabricAttributes$CaEndpoint": "

The endpoint used to access the member's certificate authority.

", "Network$VpcEndpointServiceName": "

The VPC endpoint service name of the VPC endpoint service of the network. Members use the VPC endpoint service name to create a VPC endpoint to access network resources.

", - "NetworkEthereumAttributes$ChainId": "

The Ethereum CHAIN_ID associated with the Ethereum network. Chain IDs are as follows:

", + "NetworkEthereumAttributes$ChainId": "

The Ethereum CHAIN_ID associated with the Ethereum network. Chain IDs are as follows:

", "NetworkFabricAttributes$OrderingServiceEndpoint": "

The endpoint of the ordering service for the network.

", "Node$KmsKeyArn": "

The Amazon Resource Name (ARN) of the customer managed key in Key Management Service (KMS) that the node uses for encryption at rest. If the value of this parameter is \"AWS Owned KMS Key\", the node uses an Amazon Web Services owned KMS key for encryption. The node inherits this parameter from the member that it belongs to.

For more information, see Encryption at Rest in the Amazon Managed Blockchain Hyperledger Fabric Developer Guide.

Applies only to Hyperledger Fabric.

", "NodeEthereumAttributes$HttpEndpoint": "

The endpoint on which the Ethereum node listens to run Ethereum API methods over HTTP connections from a client. Use this endpoint in client code for smart contracts when using an HTTP connection. Connections to this endpoint are authenticated using Signature Version 4.

", diff --git a/models/apis/managedblockchain/2018-09-24/endpoint-rule-set-1.json b/models/apis/managedblockchain/2018-09-24/endpoint-rule-set-1.json index f33cf19b95f..0859f591678 100644 --- a/models/apis/managedblockchain/2018-09-24/endpoint-rule-set-1.json +++ b/models/apis/managedblockchain/2018-09-24/endpoint-rule-set-1.json @@ -58,52 +58,56 @@ "type": "error" }, { - "conditions": [], - "type": "tree", - "rules": [ + "conditions": [ { - "conditions": [ + "fn": "booleanEquals", + "argv": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" + "ref": "UseDualStack" }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" + true + ] } - ] + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, { - "conditions": [], + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Region" + } + ] + } + ], "type": "tree", "rules": [ { "conditions": [ { - "fn": "isSet", + "fn": "aws.partition", "argv": [ { "ref": "Region" } - ] + ], + "assign": "PartitionResult" } ], "type": "tree", @@ -111,13 +115,22 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "booleanEquals", "argv": [ { - "ref": "Region" - } - ], - "assign": "PartitionResult" + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] } ], "type": "tree", @@ -127,224 +140,175 @@ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseFIPS" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] }, { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - }, - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://managedblockchain-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" + "endpoint": { + "url": "https://managedblockchain-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "type": "tree", + "rules": [ { "conditions": [ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseFIPS" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ { - "conditions": [], - "endpoint": { - "url": "https://managedblockchain-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsFIPS" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" + "endpoint": { + "url": "https://managedblockchain-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ { "conditions": [ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://managedblockchain.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsDualStack" ] } ] - }, - { - "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" } - ] - }, - { - "conditions": [], + ], "type": "tree", "rules": [ { "conditions": [], "endpoint": { - "url": "https://managedblockchain.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://managedblockchain.{Region}.{PartitionResult#dualStackDnsSuffix}", "properties": {}, "headers": {} }, "type": "endpoint" } ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" } ] + }, + { + "conditions": [], + "endpoint": { + "url": "https://managedblockchain.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, - { - "conditions": [], - "error": "Invalid Configuration: Missing Region", - "type": "error" } ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } \ No newline at end of file diff --git a/models/apis/rds/2014-10-31/api-2.json b/models/apis/rds/2014-10-31/api-2.json index c718888014e..e487c53b626 100644 --- a/models/apis/rds/2014-10-31/api-2.json +++ b/models/apis/rds/2014-10-31/api-2.json @@ -2944,6 +2944,7 @@ "CertificateMessage":{ "type":"structure", "members":{ + "DefaultCertificateForNewLaunches":{"shape":"String"}, "Certificates":{"shape":"CertificateList"}, "Marker":{"shape":"String"} } diff --git a/models/apis/rds/2014-10-31/docs-2.json b/models/apis/rds/2014-10-31/docs-2.json index 218368831a8..b81b382b959 100644 --- a/models/apis/rds/2014-10-31/docs-2.json +++ b/models/apis/rds/2014-10-31/docs-2.json @@ -53,7 +53,7 @@ "DeregisterDBProxyTargets": "

Remove the association between one or more DBProxyTarget data structures and a DBProxyTargetGroup.

", "DescribeAccountAttributes": "

Lists all of the attributes for a customer account. The attributes include Amazon RDS quotas for the account, such as the number of DB instances allowed. The description for a quota includes the quota name, current usage toward that quota, and the quota's maximum value.

This command doesn't take any parameters.

", "DescribeBlueGreenDeployments": "

Describes one or more blue/green deployments.

For more information, see Using Amazon RDS Blue/Green Deployments for database updates in the Amazon RDS User Guide and Using Amazon RDS Blue/Green Deployments for database updates in the Amazon Aurora User Guide.

", - "DescribeCertificates": "

Lists the set of CA certificates provided by Amazon RDS for this Amazon Web Services account.

For more information, see Using SSL/TLS to encrypt a connection to a DB instance in the Amazon RDS User Guide and Using SSL/TLS to encrypt a connection to a DB cluster in the Amazon Aurora User Guide.

", + "DescribeCertificates": "

Lists the set of certificate authority (CA) certificates provided by Amazon RDS for this Amazon Web Services account.

For more information, see Using SSL/TLS to encrypt a connection to a DB instance in the Amazon RDS User Guide and Using SSL/TLS to encrypt a connection to a DB cluster in the Amazon Aurora User Guide.

", "DescribeDBClusterAutomatedBackups": "

Displays backups for both current and deleted DB clusters. For example, use this operation to find details about automated backups for previously deleted clusters. Current clusters are returned for both the DescribeDBClusterAutomatedBackups and DescribeDBClusters operations.

All parameters are optional.

", "DescribeDBClusterBacktracks": "

Returns information about backtracks for a DB cluster.

For more information on Amazon Aurora, see What is Amazon Aurora? in the Amazon Aurora User Guide.

This action only applies to Aurora MySQL DB clusters.

", "DescribeDBClusterEndpoints": "

Returns information about endpoints for an Amazon Aurora DB cluster.

This action only applies to Aurora DB clusters.

", @@ -132,7 +132,7 @@ "RestoreDBClusterToPointInTime": "

Restores a DB cluster to an arbitrary point in time. Users can restore to any point in time before LatestRestorableTime for up to BackupRetentionPeriod days. The target DB cluster is created from the source DB cluster with the same configuration as the original DB cluster, except that the new DB cluster is created with the default DB security group.

For Aurora, this action only restores the DB cluster, not the DB instances for that DB cluster. You must invoke the CreateDBInstance action to create DB instances for the restored DB cluster, specifying the identifier of the restored DB cluster in DBClusterIdentifier. You can create DB instances only after the RestoreDBClusterToPointInTime action has completed and the DB cluster is available.

For more information on Amazon Aurora DB clusters, see What is Amazon Aurora? in the Amazon Aurora User Guide.

For more information on Multi-AZ DB clusters, see Multi-AZ DB cluster deployments in the Amazon RDS User Guide.

", "RestoreDBInstanceFromDBSnapshot": "

Creates a new DB instance from a DB snapshot. The target database is created from the source database restore point with most of the source's original configuration, including the default security group and DB parameter group. By default, the new DB instance is created as a Single-AZ deployment, except when the instance is a SQL Server instance that has an option group associated with mirroring. In this case, the instance becomes a Multi-AZ deployment, not a Single-AZ deployment.

If you want to replace your original DB instance with the new, restored DB instance, then rename your original DB instance before you call the RestoreDBInstanceFromDBSnapshot action. RDS doesn't allow two DB instances with the same name. After you have renamed your original DB instance with a different identifier, then you can pass the original name of the DB instance as the DBInstanceIdentifier in the call to the RestoreDBInstanceFromDBSnapshot action. The result is that you replace the original DB instance with the DB instance created from the snapshot.

If you are restoring from a shared manual DB snapshot, the DBSnapshotIdentifier must be the ARN of the shared DB snapshot.

This command doesn't apply to Aurora MySQL and Aurora PostgreSQL. For Aurora, use RestoreDBClusterFromSnapshot.

", "RestoreDBInstanceFromS3": "

Amazon Relational Database Service (Amazon RDS) supports importing MySQL databases by using backup files. You can create a backup of your on-premises database, store it on Amazon Simple Storage Service (Amazon S3), and then restore the backup file onto a new Amazon RDS DB instance running MySQL. For more information, see Importing Data into an Amazon RDS MySQL DB Instance in the Amazon RDS User Guide.

This command doesn't apply to RDS Custom.

", - "RestoreDBInstanceToPointInTime": "

Restores a DB instance to an arbitrary point in time. You can restore to any point in time before the time identified by the LatestRestorableTime property. You can restore to a point up to the number of days specified by the BackupRetentionPeriod property.

The target database is created with most of the original configuration, but in a system-selected Availability Zone, with the default security group, the default subnet group, and the default DB parameter group. By default, the new DB instance is created as a single-AZ deployment except when the instance is a SQL Server instance that has an option group that is associated with mirroring; in this case, the instance becomes a mirrored deployment and not a single-AZ deployment.

This command doesn't apply to Aurora MySQL and Aurora PostgreSQL. For Aurora, use RestoreDBClusterToPointInTime.

", + "RestoreDBInstanceToPointInTime": "

Restores a DB instance to an arbitrary point in time. You can restore to any point in time before the time identified by the LatestRestorableTime property. You can restore to a point up to the number of days specified by the BackupRetentionPeriod property.

The target database is created with most of the original configuration, but in a system-selected Availability Zone, with the default security group, the default subnet group, and the default DB parameter group. By default, the new DB instance is created as a single-AZ deployment except when the instance is a SQL Server instance that has an option group that is associated with mirroring; in this case, the instance becomes a mirrored deployment and not a single-AZ deployment.

This command doesn't apply to Aurora MySQL and Aurora PostgreSQL. For Aurora, use RestoreDBClusterToPointInTime.

", "RevokeDBSecurityGroupIngress": "

Revokes ingress from a DBSecurityGroup for previously authorized IP ranges or EC2 or VPC security groups. Required parameters for this API are one of CIDRIP, EC2SecurityGroupId for VPC, or (EC2SecurityGroupOwnerId and either EC2SecurityGroupName or EC2SecurityGroupId).

EC2-Classic was retired on August 15, 2022. If you haven't migrated from EC2-Classic to a VPC, we recommend that you migrate as soon as possible. For more information, see Migrate from EC2-Classic to a VPC in the Amazon EC2 User Guide, the blog EC2-Classic Networking is Retiring – Here’s How to Prepare, and Moving a DB instance not in a VPC into a VPC in the Amazon RDS User Guide.

", "StartActivityStream": "

Starts a database activity stream to monitor activity on the database. For more information, see Monitoring Amazon Aurora with Database Activity Streams in the Amazon Aurora User Guide or Monitoring Amazon RDS with Database Activity Streams in the Amazon RDS User Guide.

", "StartDBCluster": "

Starts an Amazon Aurora DB cluster that was stopped using the Amazon Web Services console, the stop-db-cluster CLI command, or the StopDBCluster action.

For more information, see Stopping and Starting an Aurora Cluster in the Amazon Aurora User Guide.

This action only applies to Aurora DB clusters.

", @@ -473,7 +473,7 @@ "FailoverState$IsDataLossAllowed": "

Indicates whether the operation is a global switchover or a global failover. If data loss is allowed, then the operation is a global failover. Otherwise, it's a switchover.

", "GlobalClusterMember$IsWriter": "

Specifies whether the Aurora DB cluster is the primary cluster (that is, has read-write capability) for the global cluster with which it is associated.

", "ModifyDBClusterMessage$ApplyImmediately": "

Specifies whether the modifications in this request and any pending modifications are asynchronously applied as soon as possible, regardless of the PreferredMaintenanceWindow setting for the DB cluster. If this parameter is disabled, changes to the DB cluster are applied during the next maintenance window.

Most modifications can be applied immediately or during the next scheduled maintenance window. Some modifications, such as turning on deletion protection and changing the master password, are applied immediately—regardless of when you choose to apply them.

By default, this parameter is disabled.

Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters

", - "ModifyDBClusterMessage$AllowMajorVersionUpgrade": "

Specifies whether major version upgrades are allowed.

Valid for Cluster Type: Aurora DB clusters only

Constraints:

", + "ModifyDBClusterMessage$AllowMajorVersionUpgrade": "

Specifies whether major version upgrades are allowed.

Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters

Constraints:

", "ModifyDBClusterMessage$AllowEngineModeChange": "

Specifies whether engine mode changes from serverless to provisioned are allowed.

Valid for Cluster Type: Aurora Serverless v1 DB clusters only

Constraints:

", "ModifyDBInstanceMessage$ApplyImmediately": "

Specifies whether the modifications in this request and any pending modifications are asynchronously applied as soon as possible, regardless of the PreferredMaintenanceWindow setting for the DB instance. By default, this parameter is disabled.

If this parameter is disabled, changes to the DB instance are applied during the next maintenance window. Some parameter changes can cause an outage and are applied on the next call to RebootDBInstance, or the next failure reboot. Review the table of parameters in Modifying a DB Instance in the Amazon RDS User Guide to see the impact of enabling or disabling ApplyImmediately for each modified parameter and to determine when the changes are applied.

", "ModifyDBInstanceMessage$AllowMajorVersionUpgrade": "

Specifies whether major version upgrades are allowed. Changing this parameter doesn't result in an outage and the change is asynchronously applied as soon as possible.

This setting doesn't apply to RDS Custom DB instances.

Constraints:

", @@ -509,7 +509,7 @@ "ResetDBClusterParameterGroupMessage$ResetAllParameters": "

A value that indicates whether to reset all parameters in the DB cluster parameter group to their default values. You can't use this parameter if there is a list of parameter names specified for the Parameters parameter.

", "ResetDBParameterGroupMessage$ResetAllParameters": "

A value that indicates whether to reset all parameters in the DB parameter group to default values. By default, all parameters in the DB parameter group are reset to default values.

", "RestoreDBClusterToPointInTimeMessage$UseLatestRestorableTime": "

A value that indicates whether to restore the DB cluster to the latest restorable backup time. By default, the DB cluster isn't restored to the latest restorable backup time.

Constraints: Can't be specified if RestoreToTime parameter is provided.

Valid for: Aurora DB clusters and Multi-AZ DB clusters

", - "RestoreDBInstanceToPointInTimeMessage$UseLatestRestorableTime": "

A value that indicates whether the DB instance is restored from the latest backup time. By default, the DB instance isn't restored from the latest backup time.

Constraints: Can't be specified if the RestoreTime parameter is provided.

", + "RestoreDBInstanceToPointInTimeMessage$UseLatestRestorableTime": "

Specifies whether the DB instance is restored from the latest backup time. By default, the DB instance isn't restored from the latest backup time.

Constraints:

", "SourceRegion$SupportsDBInstanceAutomatedBackupsReplication": "

Whether the source Amazon Web Services Region supports replicating automated backups to the current Amazon Web Services Region.

", "StartActivityStreamResponse$ApplyImmediately": "

Indicates whether or not the database activity stream will start as soon as possible, regardless of the maintenance window for the database.

", "UpgradeTarget$AutoUpgrade": "

A value that indicates whether the target version is applied to any source DB instances that have AutoMinorVersionUpgrade set to true.

", @@ -656,14 +656,14 @@ "RestoreDBInstanceFromS3Message$UseDefaultProcessorFeatures": "

A value that indicates whether the DB instance class of the DB instance uses its default processor features.

", "RestoreDBInstanceFromS3Message$DeletionProtection": "

A value that indicates whether the DB instance has deletion protection enabled. The database can't be deleted when deletion protection is enabled. By default, deletion protection isn't enabled. For more information, see Deleting a DB Instance.

", "RestoreDBInstanceFromS3Message$ManageMasterUserPassword": "

A value that indicates whether to manage the master user password with Amazon Web Services Secrets Manager.

For more information, see Password management with Amazon Web Services Secrets Manager in the Amazon RDS User Guide.

Constraints:

", - "RestoreDBInstanceToPointInTimeMessage$MultiAZ": "

A value that indicates whether the DB instance is a Multi-AZ deployment.

This setting doesn't apply to RDS Custom.

Constraint: You can't specify the AvailabilityZone parameter if the DB instance is a Multi-AZ deployment.

", - "RestoreDBInstanceToPointInTimeMessage$PubliclyAccessible": "

A value that indicates whether the DB instance is publicly accessible.

When the DB cluster is publicly accessible, its Domain Name System (DNS) endpoint resolves to the private IP address from within the DB cluster's virtual private cloud (VPC). It resolves to the public IP address from outside of the DB cluster's VPC. Access to the DB cluster is ultimately controlled by the security group it uses. That public access isn't permitted if the security group assigned to the DB cluster doesn't permit it.

When the DB instance isn't publicly accessible, it is an internal DB instance with a DNS name that resolves to a private IP address.

For more information, see CreateDBInstance.

", - "RestoreDBInstanceToPointInTimeMessage$AutoMinorVersionUpgrade": "

A value that indicates whether minor version upgrades are applied automatically to the DB instance during the maintenance window.

This setting doesn't apply to RDS Custom.

", - "RestoreDBInstanceToPointInTimeMessage$CopyTagsToSnapshot": "

A value that indicates whether to copy all tags from the restored DB instance to snapshots of the DB instance. By default, tags are not copied.

", - "RestoreDBInstanceToPointInTimeMessage$EnableIAMDatabaseAuthentication": "

A value that indicates whether to enable mapping of Amazon Web Services Identity and Access Management (IAM) accounts to database accounts. By default, mapping isn't enabled.

This setting doesn't apply to RDS Custom.

For more information about IAM database authentication, see IAM Database Authentication for MySQL and PostgreSQL in the Amazon RDS User Guide.

", + "RestoreDBInstanceToPointInTimeMessage$MultiAZ": "

Secifies whether the DB instance is a Multi-AZ deployment.

This setting doesn't apply to RDS Custom.

Constraints:

", + "RestoreDBInstanceToPointInTimeMessage$PubliclyAccessible": "

Specifies whether the DB instance is publicly accessible.

When the DB cluster is publicly accessible, its Domain Name System (DNS) endpoint resolves to the private IP address from within the DB cluster's virtual private cloud (VPC). It resolves to the public IP address from outside of the DB cluster's VPC. Access to the DB cluster is ultimately controlled by the security group it uses. That public access isn't permitted if the security group assigned to the DB cluster doesn't permit it.

When the DB instance isn't publicly accessible, it is an internal DB instance with a DNS name that resolves to a private IP address.

For more information, see CreateDBInstance.

", + "RestoreDBInstanceToPointInTimeMessage$AutoMinorVersionUpgrade": "

Specifies whether minor version upgrades are applied automatically to the DB instance during the maintenance window.

This setting doesn't apply to RDS Custom.

", + "RestoreDBInstanceToPointInTimeMessage$CopyTagsToSnapshot": "

Specifies whether to copy all tags from the restored DB instance to snapshots of the DB instance. By default, tags are not copied.

", + "RestoreDBInstanceToPointInTimeMessage$EnableIAMDatabaseAuthentication": "

Specifies whether to enable mapping of Amazon Web Services Identity and Access Management (IAM) accounts to database accounts. By default, mapping isn't enabled.

This setting doesn't apply to RDS Custom.

For more information about IAM database authentication, see IAM Database Authentication for MySQL and PostgreSQL in the Amazon RDS User Guide.

", "RestoreDBInstanceToPointInTimeMessage$UseDefaultProcessorFeatures": "

A value that indicates whether the DB instance class of the DB instance uses its default processor features.

This setting doesn't apply to RDS Custom.

", - "RestoreDBInstanceToPointInTimeMessage$DeletionProtection": "

A value that indicates whether the DB instance has deletion protection enabled. The database can't be deleted when deletion protection is enabled. By default, deletion protection isn't enabled. For more information, see Deleting a DB Instance.

", - "RestoreDBInstanceToPointInTimeMessage$EnableCustomerOwnedIp": "

A value that indicates whether to enable a customer-owned IP address (CoIP) for an RDS on Outposts DB instance.

A CoIP provides local or external connectivity to resources in your Outpost subnets through your on-premises network. For some use cases, a CoIP can provide lower latency for connections to the DB instance from outside of its virtual private cloud (VPC) on your local network.

This setting doesn't apply to RDS Custom.

For more information about RDS on Outposts, see Working with Amazon RDS on Amazon Web Services Outposts in the Amazon RDS User Guide.

For more information about CoIPs, see Customer-owned IP addresses in the Amazon Web Services Outposts User Guide.

", + "RestoreDBInstanceToPointInTimeMessage$DeletionProtection": "

Specifies whether the DB instance has deletion protection enabled. The database can't be deleted when deletion protection is enabled. By default, deletion protection isn't enabled. For more information, see Deleting a DB Instance.

", + "RestoreDBInstanceToPointInTimeMessage$EnableCustomerOwnedIp": "

Specifies whether to enable a customer-owned IP address (CoIP) for an RDS on Outposts DB instance.

A CoIP provides local or external connectivity to resources in your Outpost subnets through your on-premises network. For some use cases, a CoIP can provide lower latency for connections to the DB instance from outside of its virtual private cloud (VPC) on your local network.

This setting doesn't apply to RDS Custom.

For more information about RDS on Outposts, see Working with Amazon RDS on Amazon Web Services Outposts in the Amazon RDS User Guide.

For more information about CoIPs, see Customer-owned IP addresses in the Amazon Web Services Outposts User Guide.

", "ScalingConfiguration$AutoPause": "

A value that indicates whether to allow or disallow automatic pause for an Aurora DB cluster in serverless DB engine mode. A DB cluster can be paused only when it's idle (it has no connections).

If a DB cluster is paused for more than seven days, the DB cluster might be backed up with a snapshot. In this case, the DB cluster is restored when there is a request to connect to it.

", "ScalingConfigurationInfo$AutoPause": "

A value that indicates whether automatic pause is allowed for the Aurora DB cluster in serverless DB engine mode.

When the value is set to false for an Aurora Serverless v1 DB cluster, the DB cluster automatically resumes.

", "StartActivityStreamRequest$ApplyImmediately": "

Specifies whether or not the database activity stream is to start as soon as possible, regardless of the maintenance window for the database.

", @@ -2830,10 +2830,10 @@ "RestoreDBInstanceFromS3Message$PerformanceInsightsRetentionPeriod": "

The number of days to retain Performance Insights data. The default is 7 days. The following values are valid:

For example, the following values are valid:

If you specify a retention period such as 94, which isn't a valid value, RDS issues an error.

", "RestoreDBInstanceFromS3Message$MaxAllocatedStorage": "

The upper limit in gibibytes (GiB) to which Amazon RDS can automatically scale the storage of the DB instance.

For more information about this setting, including limitations that apply to it, see Managing capacity automatically with Amazon RDS storage autoscaling in the Amazon RDS User Guide.

", "RestoreDBInstanceFromS3Message$StorageThroughput": "

Specifies the storage throughput value for the DB instance.

This setting doesn't apply to RDS Custom or Amazon Aurora.

", - "RestoreDBInstanceToPointInTimeMessage$Port": "

The port number on which the database accepts connections.

Constraints: Value must be 1150-65535

Default: The same port as the original DB instance.

", - "RestoreDBInstanceToPointInTimeMessage$Iops": "

The amount of Provisioned IOPS (input/output operations per second) to be initially allocated for the DB instance.

Constraints: Must be an integer greater than 1000.

SQL Server

Setting the IOPS value for the SQL Server database engine isn't supported.

", + "RestoreDBInstanceToPointInTimeMessage$Port": "

The port number on which the database accepts connections.

Default: The same port as the original DB instance.

Constraints:

", + "RestoreDBInstanceToPointInTimeMessage$Iops": "

The amount of Provisioned IOPS (input/output operations per second) to initially allocate for the DB instance.

This setting doesn't apply to SQL Server.

Constraints:

", "RestoreDBInstanceToPointInTimeMessage$MaxAllocatedStorage": "

The upper limit in gibibytes (GiB) to which Amazon RDS can automatically scale the storage of the DB instance.

For more information about this setting, including limitations that apply to it, see Managing capacity automatically with Amazon RDS storage autoscaling in the Amazon RDS User Guide.

This setting doesn't apply to RDS Custom.

", - "RestoreDBInstanceToPointInTimeMessage$StorageThroughput": "

Specifies the storage throughput value for the DB instance.

This setting doesn't apply to RDS Custom or Amazon Aurora.

", + "RestoreDBInstanceToPointInTimeMessage$StorageThroughput": "

The storage throughput value for the DB instance.

This setting doesn't apply to RDS Custom or Amazon Aurora.

", "RestoreDBInstanceToPointInTimeMessage$AllocatedStorage": "

The amount of storage (in gibibytes) to allocate initially for the DB instance. Follow the allocation rules specified in CreateDBInstance.

Be sure to allocate enough storage for your new DB instance so that the restore operation can succeed. You can also allocate additional storage for future growth.

", "ScalingConfiguration$MinCapacity": "

The minimum capacity for an Aurora DB cluster in serverless DB engine mode.

For Aurora MySQL, valid capacity values are 1, 2, 4, 8, 16, 32, 64, 128, and 256.

For Aurora PostgreSQL, valid capacity values are 2, 4, 8, 16, 32, 64, 192, and 384.

The minimum capacity must be less than or equal to the maximum capacity.

", "ScalingConfiguration$MaxCapacity": "

The maximum capacity for an Aurora DB cluster in serverless DB engine mode.

For Aurora MySQL, valid capacity values are 1, 2, 4, 8, 16, 32, 64, 128, and 256.

For Aurora PostgreSQL, valid capacity values are 2, 4, 8, 16, 32, 64, 192, and 384.

The maximum capacity must be greater than or equal to the minimum capacity.

", @@ -4055,6 +4055,7 @@ "Certificate$Thumbprint": "

The thumbprint of the certificate.

", "Certificate$CertificateArn": "

The Amazon Resource Name (ARN) for the certificate.

", "CertificateDetails$CAIdentifier": "

The CA identifier of the CA certificate used for the DB instance's server certificate.

", + "CertificateMessage$DefaultCertificateForNewLaunches": "

The default root CA for new databases created by your Amazon Web Services account. This is either the root CA override set on your Amazon Web Services account or the system default CA for the Region if no override exists. To override the default CA, use the ModifyCertificates operation.

", "CertificateMessage$Marker": "

An optional pagination token provided by a previous DescribeCertificates request. If this parameter is specified, the response includes only records beyond the marker, up to the value specified by MaxRecords .

", "CharacterSet$CharacterSetName": "

The name of the character set.

", "CharacterSet$CharacterSetDescription": "

The description of the character set.

", @@ -4670,13 +4671,13 @@ "ModifyDBClusterSnapshotAttributeMessage$DBClusterSnapshotIdentifier": "

The identifier for the DB cluster snapshot to modify the attributes for.

", "ModifyDBClusterSnapshotAttributeMessage$AttributeName": "

The name of the DB cluster snapshot attribute to modify.

To manage authorization for other Amazon Web Services accounts to copy or restore a manual DB cluster snapshot, set this value to restore.

To view the list of attributes available to modify, use the DescribeDBClusterSnapshotAttributes API operation.

", "ModifyDBInstanceMessage$DBInstanceIdentifier": "

The identifier of DB instance to modify. This value is stored as a lowercase string.

Constraints:

", - "ModifyDBInstanceMessage$DBInstanceClass": "

The new compute and memory capacity of the DB instance, for example db.m4.large. Not all DB instance classes are available in all Amazon Web Services Regions, or for all database engines. For the full list of DB instance classes, and availability for your engine, see DB Instance Class in the Amazon RDS User Guide or Aurora DB instance classes in the Amazon Aurora User Guide. For RDS Custom, see DB instance class support for RDS Custom for Oracle and DB instance class support for RDS Custom for SQL Server.

If you modify the DB instance class, an outage occurs during the change. The change is applied during the next maintenance window, unless you specify ApplyImmediately in your request.

Default: Uses existing setting

", + "ModifyDBInstanceMessage$DBInstanceClass": "

The new compute and memory capacity of the DB instance, for example db.m4.large. Not all DB instance classes are available in all Amazon Web Services Regions, or for all database engines. For the full list of DB instance classes, and availability for your engine, see DB Instance Class in the Amazon RDS User Guide or Aurora DB instance classes in the Amazon Aurora User Guide. For RDS Custom, see DB instance class support for RDS Custom for Oracle and DB instance class support for RDS Custom for SQL Server.

If you modify the DB instance class, an outage occurs during the change. The change is applied during the next maintenance window, unless you specify ApplyImmediately in your request.

Default: Uses existing setting

Constraints:

", "ModifyDBInstanceMessage$DBSubnetGroupName": "

The new DB subnet group for the DB instance. You can use this parameter to move your DB instance to a different VPC. If your DB instance isn't in a VPC, you can also use this parameter to move your DB instance into a VPC. For more information, see Working with a DB instance in a VPC in the Amazon RDS User Guide.

Changing the subnet group causes an outage during the change. The change is applied during the next maintenance window, unless you enable ApplyImmediately.

This parameter doesn't apply to RDS Custom DB instances.

Constraints:

Example: mydbsubnetgroup

", "ModifyDBInstanceMessage$MasterUserPassword": "

The new password for the master user.

Changing this parameter doesn't result in an outage and the change is asynchronously applied as soon as possible. Between the time of the request and the completion of the request, the MasterUserPassword element exists in the PendingModifiedValues element of the operation response.

Amazon RDS API operations never return the password, so this action provides a way to regain access to a primary instance user if the password is lost. This includes restoring privileges that might have been accidentally revoked.

This setting doesn't apply to the following DB instances:

Default: Uses existing setting

Constraints:

Length Constraints:

", "ModifyDBInstanceMessage$DBParameterGroupName": "

The name of the DB parameter group to apply to the DB instance.

Changing this setting doesn't result in an outage. The parameter group name itself is changed immediately, but the actual parameter changes are not applied until you reboot the instance without failover. In this case, the DB instance isn't rebooted automatically, and the parameter changes aren't applied during the next maintenance window. However, if you modify dynamic parameters in the newly associated DB parameter group, these changes are applied immediately without a reboot.

This setting doesn't apply to RDS Custom DB instances.

Default: Uses existing setting

Constraints:

", "ModifyDBInstanceMessage$PreferredBackupWindow": "

The daily time range during which automated backups are created if automated backups are enabled, as determined by the BackupRetentionPeriod parameter. Changing this parameter doesn't result in an outage and the change is asynchronously applied as soon as possible. The default is a 30-minute window selected at random from an 8-hour block of time for each Amazon Web Services Region. For more information, see Backup window in the Amazon RDS User Guide.

This setting doesn't apply to Amazon Aurora DB instances. The daily time range for creating automated backups is managed by the DB cluster. For more information, see ModifyDBCluster.

Constraints:

", "ModifyDBInstanceMessage$PreferredMaintenanceWindow": "

The weekly time range during which system maintenance can occur, which might result in an outage. Changing this parameter doesn't result in an outage, except in the following situation, and the change is asynchronously applied as soon as possible. If there are pending actions that cause a reboot, and the maintenance window is changed to include the current time, then changing this parameter causes a reboot of the DB instance. If you change this window to the current time, there must be at least 30 minutes between the current time and end of the window to ensure pending changes are applied.

For more information, see Amazon RDS Maintenance Window in the Amazon RDS User Guide.

Default: Uses existing setting

Constraints:

", - "ModifyDBInstanceMessage$EngineVersion": "

The version number of the database engine to upgrade to. Changing this parameter results in an outage and the change is applied during the next maintenance window unless the ApplyImmediately parameter is enabled for this request.

For major version upgrades, if a nondefault DB parameter group is currently in use, a new DB parameter group in the DB parameter group family for the new engine version must be specified. The new DB parameter group can be the default for that DB parameter group family.

If you specify only a major version, Amazon RDS updates the DB instance to the default minor version if the current minor version is lower. For information about valid engine versions, see CreateDBInstance, or call DescribeDBEngineVersions.

If the instance that you're modifying is acting as a read replica, the engine version that you specify must be the same or higher than the version that the source DB instance or cluster is running.

In RDS Custom for Oracle, this parameter is supported for read replicas only if they are in the PATCH_DB_FAILURE lifecycle.

", + "ModifyDBInstanceMessage$EngineVersion": "

The version number of the database engine to upgrade to. Changing this parameter results in an outage and the change is applied during the next maintenance window unless the ApplyImmediately parameter is enabled for this request.

For major version upgrades, if a nondefault DB parameter group is currently in use, a new DB parameter group in the DB parameter group family for the new engine version must be specified. The new DB parameter group can be the default for that DB parameter group family.

If you specify only a major version, Amazon RDS updates the DB instance to the default minor version if the current minor version is lower. For information about valid engine versions, see CreateDBInstance, or call DescribeDBEngineVersions.

If the instance that you're modifying is acting as a read replica, the engine version that you specify must be the same or higher than the version that the source DB instance or cluster is running.

In RDS Custom for Oracle, this parameter is supported for read replicas only if they are in the PATCH_DB_FAILURE lifecycle.

Constraints:

", "ModifyDBInstanceMessage$LicenseModel": "

The license model for the DB instance.

This setting doesn't apply to Amazon Aurora or RDS Custom DB instances.

Valid Values:

", "ModifyDBInstanceMessage$OptionGroupName": "

The option group to associate the DB instance with.

Changing this parameter doesn't result in an outage, with one exception. If the parameter change results in an option group that enables OEM, it can cause a brief period, lasting less than a second, during which new connections are rejected but existing connections aren't interrupted.

The change is applied during the next maintenance window unless the ApplyImmediately parameter is enabled for this request.

Permanent options, such as the TDE option for Oracle Advanced Security TDE, can't be removed from an option group, and that option group can't be removed from a DB instance after it is associated with a DB instance.

This setting doesn't apply to RDS Custom DB instances.

", "ModifyDBInstanceMessage$NewDBInstanceIdentifier": "

The new identifier for the DB instance when renaming a DB instance. When you change the DB instance identifier, an instance reboot occurs immediately if you enable ApplyImmediately, or will occur during the next maintenance window if you disable ApplyImmediately. This value is stored as a lowercase string.

This setting doesn't apply to RDS Custom DB instances.

Constraints:

Example: mydbinstance

", @@ -4872,11 +4873,11 @@ "RestoreDBClusterToPointInTimeMessage$DBSubnetGroupName": "

The DB subnet group name to use for the new DB cluster.

Constraints: If supplied, must match the name of an existing DBSubnetGroup.

Example: mydbsubnetgroup

Valid for: Aurora DB clusters and Multi-AZ DB clusters

", "RestoreDBClusterToPointInTimeMessage$OptionGroupName": "

The name of the option group for the new DB cluster.

DB clusters are associated with a default option group that can't be modified.

", "RestoreDBClusterToPointInTimeMessage$KmsKeyId": "

The Amazon Web Services KMS key identifier to use when restoring an encrypted DB cluster from an encrypted DB cluster.

The Amazon Web Services KMS key identifier is the key ARN, key ID, alias ARN, or alias name for the KMS key. To use a KMS key in a different Amazon Web Services account, specify the key ARN or alias ARN.

You can restore to a new DB cluster and encrypt the new DB cluster with a KMS key that is different from the KMS key used to encrypt the source DB cluster. The new DB cluster is encrypted with the KMS key identified by the KmsKeyId parameter.

If you don't specify a value for the KmsKeyId parameter, then the following occurs:

If DBClusterIdentifier refers to a DB cluster that isn't encrypted, then the restore request is rejected.

Valid for: Aurora DB clusters and Multi-AZ DB clusters

", - "RestoreDBClusterToPointInTimeMessage$DBClusterParameterGroupName": "

The name of the DB cluster parameter group to associate with this DB cluster. If this argument is omitted, the default DB cluster parameter group for the specified engine is used.

Constraints:

Valid for: Aurora DB clusters and Multi-AZ DB clusters

", + "RestoreDBClusterToPointInTimeMessage$DBClusterParameterGroupName": "

The name of the custom DB cluster parameter group to associate with this DB cluster.

If the DBClusterParameterGroupName parameter is omitted, the default DB cluster parameter group for the specified engine is used.

Constraints:

Valid for: Aurora DB clusters and Multi-AZ DB clusters

", "RestoreDBClusterToPointInTimeMessage$Domain": "

Specify the Active Directory directory ID to restore the DB cluster in. The domain must be created prior to this operation.

For Amazon Aurora DB clusters, Amazon RDS can use Kerberos Authentication to authenticate users that connect to the DB cluster. For more information, see Kerberos Authentication in the Amazon Aurora User Guide.

Valid for: Aurora DB clusters only

", "RestoreDBClusterToPointInTimeMessage$DomainIAMRoleName": "

Specify the name of the IAM role to be used when making API calls to the Directory Service.

Valid for: Aurora DB clusters only

", "RestoreDBClusterToPointInTimeMessage$EngineMode": "

The engine mode of the new cluster. Specify provisioned or serverless, depending on the type of the cluster you are creating. You can create an Aurora Serverless v1 clone from a provisioned cluster, or a provisioned clone from an Aurora Serverless v1 cluster. To create a clone that is an Aurora Serverless v1 cluster, the original cluster must be an Aurora Serverless v1 cluster or an encrypted provisioned cluster.

Valid for: Aurora DB clusters only

", - "RestoreDBClusterToPointInTimeMessage$DBClusterInstanceClass": "

The compute and memory capacity of the each DB instance in the Multi-AZ DB cluster, for example db.m6gd.xlarge. Not all DB instance classes are available in all Amazon Web Services Regions, or for all database engines.

For the full list of DB instance classes, and availability for your engine, see DB instance class in the Amazon RDS User Guide.

Valid for: Multi-AZ DB clusters only

", + "RestoreDBClusterToPointInTimeMessage$DBClusterInstanceClass": "

The compute and memory capacity of the each DB instance in the Multi-AZ DB cluster, for example db.m6gd.xlarge. Not all DB instance classes are available in all Amazon Web Services Regions, or for all database engines.

For the full list of DB instance classes, and availability for your engine, see DB instance class in the Amazon RDS User Guide.

Valid for: Multi-AZ DB clusters only

", "RestoreDBClusterToPointInTimeMessage$StorageType": "

Specifies the storage type to be associated with the DB cluster.

When specified for a Multi-AZ DB cluster, a value for the Iops parameter is required.

Valid values: aurora, aurora-iopt1 (Aurora DB clusters); io1 (Multi-AZ DB clusters)

Default: aurora (Aurora DB clusters); io1 (Multi-AZ DB clusters)

Valid for: Aurora DB clusters and Multi-AZ DB clusters

", "RestoreDBClusterToPointInTimeMessage$NetworkType": "

The network type of the DB cluster.

Valid values:

The network type is determined by the DBSubnetGroup specified for the DB cluster. A DBSubnetGroup can support only the IPv4 protocol or the IPv4 and the IPv6 protocols (DUAL).

For more information, see Working with a DB instance in a VPC in the Amazon Aurora User Guide.

Valid for: Aurora DB clusters only

", "RestoreDBClusterToPointInTimeMessage$SourceDbClusterResourceId": "

The resource ID of the source DB cluster from which to restore.

", @@ -4928,28 +4929,28 @@ "RestoreDBInstanceFromS3Message$NetworkType": "

The network type of the DB instance.

Valid values:

The network type is determined by the DBSubnetGroup specified for the DB instance. A DBSubnetGroup can support only the IPv4 protocol or the IPv4 and the IPv6 protocols (DUAL).

For more information, see Working with a DB instance in a VPC in the Amazon RDS User Guide.

", "RestoreDBInstanceFromS3Message$MasterUserSecretKmsKeyId": "

The Amazon Web Services KMS key identifier to encrypt a secret that is automatically generated and managed in Amazon Web Services Secrets Manager.

This setting is valid only if the master user password is managed by RDS in Amazon Web Services Secrets Manager for the DB instance.

The Amazon Web Services KMS key identifier is the key ARN, key ID, alias ARN, or alias name for the KMS key. To use a KMS key in a different Amazon Web Services account, specify the key ARN or alias ARN.

If you don't specify MasterUserSecretKmsKeyId, then the aws/secretsmanager KMS key is used to encrypt the secret. If the secret is in a different Amazon Web Services account, then you can't use the aws/secretsmanager KMS key to encrypt the secret, and you must use a customer managed KMS key.

There is a default KMS key for your Amazon Web Services account. Your Amazon Web Services account has a different default KMS key for each Amazon Web Services Region.

", "RestoreDBInstanceToPointInTimeMessage$SourceDBInstanceIdentifier": "

The identifier of the source DB instance from which to restore.

Constraints:

", - "RestoreDBInstanceToPointInTimeMessage$TargetDBInstanceIdentifier": "

The name of the new DB instance to be created.

Constraints:

", - "RestoreDBInstanceToPointInTimeMessage$DBInstanceClass": "

The compute and memory capacity of the Amazon RDS DB instance, for example db.m4.large. Not all DB instance classes are available in all Amazon Web Services Regions, or for all database engines. For the full list of DB instance classes, and availability for your engine, see DB Instance Class in the Amazon RDS User Guide.

Default: The same DBInstanceClass as the original DB instance.

", - "RestoreDBInstanceToPointInTimeMessage$AvailabilityZone": "

The Availability Zone (AZ) where the DB instance will be created.

Default: A random, system-chosen Availability Zone.

Constraint: You can't specify the AvailabilityZone parameter if the DB instance is a Multi-AZ deployment.

Example: us-east-1a

", - "RestoreDBInstanceToPointInTimeMessage$DBSubnetGroupName": "

The DB subnet group name to use for the new instance.

Constraints: If supplied, must match the name of an existing DBSubnetGroup.

Example: mydbsubnetgroup

", - "RestoreDBInstanceToPointInTimeMessage$LicenseModel": "

License model information for the restored DB instance.

This setting doesn't apply to RDS Custom.

Default: Same as source.

Valid values: license-included | bring-your-own-license | general-public-license

", + "RestoreDBInstanceToPointInTimeMessage$TargetDBInstanceIdentifier": "

The name of the new DB instance to create.

Constraints:

", + "RestoreDBInstanceToPointInTimeMessage$DBInstanceClass": "

The compute and memory capacity of the Amazon RDS DB instance, for example db.m4.large. Not all DB instance classes are available in all Amazon Web Services Regions, or for all database engines. For the full list of DB instance classes, and availability for your engine, see DB Instance Class in the Amazon RDS User Guide.

Default: The same DB instance class as the original DB instance.

", + "RestoreDBInstanceToPointInTimeMessage$AvailabilityZone": "

The Availability Zone (AZ) where the DB instance will be created.

Default: A random, system-chosen Availability Zone.

Constraints:

Example: us-east-1a

", + "RestoreDBInstanceToPointInTimeMessage$DBSubnetGroupName": "

The DB subnet group name to use for the new instance.

Constraints:

Example: mydbsubnetgroup

", + "RestoreDBInstanceToPointInTimeMessage$LicenseModel": "

The license model information for the restored DB instance.

This setting doesn't apply to RDS Custom.

Valid Values: license-included | bring-your-own-license | general-public-license

Default: Same as the source.

", "RestoreDBInstanceToPointInTimeMessage$DBName": "

The database name for the restored DB instance.

This parameter isn't supported for the MySQL or MariaDB engines. It also doesn't apply to RDS Custom.

", - "RestoreDBInstanceToPointInTimeMessage$Engine": "

The database engine to use for the new instance.

This setting doesn't apply to RDS Custom.

Default: The same as source

Constraint: Must be compatible with the engine of the source

Valid Values:

", - "RestoreDBInstanceToPointInTimeMessage$OptionGroupName": "

The name of the option group to be used for the restored DB instance.

Permanent options, such as the TDE option for Oracle Advanced Security TDE, can't be removed from an option group, and that option group can't be removed from a DB instance after it is associated with a DB instance

This setting doesn't apply to RDS Custom.

", - "RestoreDBInstanceToPointInTimeMessage$StorageType": "

Specifies the storage type to be associated with the DB instance.

Valid values: gp2 | gp3 | io1 | standard

If you specify io1 or gp3, you must also include a value for the Iops parameter.

Default: io1 if the Iops parameter is specified, otherwise gp2

", + "RestoreDBInstanceToPointInTimeMessage$Engine": "

The database engine to use for the new instance.

This setting doesn't apply to RDS Custom.

Valid Values:

Default: The same as source

Constraints:

", + "RestoreDBInstanceToPointInTimeMessage$OptionGroupName": "

The name of the option group to use for the restored DB instance.

Permanent options, such as the TDE option for Oracle Advanced Security TDE, can't be removed from an option group, and that option group can't be removed from a DB instance after it is associated with a DB instance

This setting doesn't apply to RDS Custom.

", + "RestoreDBInstanceToPointInTimeMessage$StorageType": "

The storage type to associate with the DB instance.

Valid Values: gp2 | gp3 | io1 | standard

Default: io1, if the Iops parameter is specified. Otherwise, gp2.

Constraints:

", "RestoreDBInstanceToPointInTimeMessage$TdeCredentialArn": "

The ARN from the key store with which to associate the instance for TDE encryption.

This setting doesn't apply to RDS Custom.

", "RestoreDBInstanceToPointInTimeMessage$TdeCredentialPassword": "

The password for the given ARN from the key store in order to access the device.

This setting doesn't apply to RDS Custom.

", - "RestoreDBInstanceToPointInTimeMessage$Domain": "

Specify the Active Directory directory ID to restore the DB instance in. Create the domain before running this command. Currently, you can create only the MySQL, Microsoft SQL Server, Oracle, and PostgreSQL DB instances in an Active Directory Domain.

This setting doesn't apply to RDS Custom.

For more information, see Kerberos Authentication in the Amazon RDS User Guide.

", + "RestoreDBInstanceToPointInTimeMessage$Domain": "

The Active Directory directory ID to restore the DB instance in. Create the domain before running this command. Currently, you can create only the MySQL, Microsoft SQL Server, Oracle, and PostgreSQL DB instances in an Active Directory Domain.

This setting doesn't apply to RDS Custom.

For more information, see Kerberos Authentication in the Amazon RDS User Guide.

", "RestoreDBInstanceToPointInTimeMessage$DomainIAMRoleName": "

The name of the IAM role to use when making API calls to the Directory Service.

This setting doesn't apply to RDS Custom DB instances.

", "RestoreDBInstanceToPointInTimeMessage$DomainFqdn": "

The fully qualified domain name (FQDN) of an Active Directory domain.

Constraints:

Example: mymanagedADtest.mymanagedAD.mydomain

", "RestoreDBInstanceToPointInTimeMessage$DomainOu": "

The Active Directory organizational unit for your DB instance to join.

Constraints:

Example: OU=mymanagedADtestOU,DC=mymanagedADtest,DC=mymanagedAD,DC=mydomain

", "RestoreDBInstanceToPointInTimeMessage$DomainAuthSecretArn": "

The ARN for the Secrets Manager secret with the credentials for the user joining the domain.

Constraints:

Example: arn:aws:secretsmanager:region:account-number:secret:myselfmanagedADtestsecret-123456

", - "RestoreDBInstanceToPointInTimeMessage$DBParameterGroupName": "

The name of the DB parameter group to associate with this DB instance.

If you do not specify a value for DBParameterGroupName, then the default DBParameterGroup for the specified DB engine is used.

This setting doesn't apply to RDS Custom.

Constraints:

", + "RestoreDBInstanceToPointInTimeMessage$DBParameterGroupName": "

The name of the DB parameter group to associate with this DB instance.

If you do not specify a value for DBParameterGroupName, then the default DBParameterGroup for the specified DB engine is used.

This setting doesn't apply to RDS Custom.

Constraints:

", "RestoreDBInstanceToPointInTimeMessage$SourceDbiResourceId": "

The resource ID of the source DB instance from which to restore.

", - "RestoreDBInstanceToPointInTimeMessage$SourceDBInstanceAutomatedBackupsArn": "

The Amazon Resource Name (ARN) of the replicated automated backups from which to restore, for example, arn:aws:rds:useast-1:123456789012:auto-backup:ab-L2IJCEXJP7XQ7HOJ4SIEXAMPLE.

This setting doesn't apply to RDS Custom.

", + "RestoreDBInstanceToPointInTimeMessage$SourceDBInstanceAutomatedBackupsArn": "

The Amazon Resource Name (ARN) of the replicated automated backups from which to restore, for example, arn:aws:rds:us-east-1:123456789012:auto-backup:ab-L2IJCEXJP7XQ7HOJ4SIEXAMPLE.

This setting doesn't apply to RDS Custom.

", "RestoreDBInstanceToPointInTimeMessage$CustomIamInstanceProfile": "

The instance profile associated with the underlying Amazon EC2 instance of an RDS Custom DB instance. The instance profile must meet the following requirements:

For the list of permissions required for the IAM role, see Configure IAM and your VPC in the Amazon RDS User Guide.

This setting is required for RDS Custom.

", "RestoreDBInstanceToPointInTimeMessage$BackupTarget": "

Specifies where automated backups and manual snapshots are stored for the restored DB instance.

Possible values are outposts (Amazon Web Services Outposts) and region (Amazon Web Services Region). The default is region.

For more information, see Working with Amazon RDS on Amazon Web Services Outposts in the Amazon RDS User Guide.

", - "RestoreDBInstanceToPointInTimeMessage$NetworkType": "

The network type of the DB instance.

Valid values:

The network type is determined by the DBSubnetGroup specified for the DB instance. A DBSubnetGroup can support only the IPv4 protocol or the IPv4 and the IPv6 protocols (DUAL).

For more information, see Working with a DB instance in a VPC in the Amazon RDS User Guide.

", + "RestoreDBInstanceToPointInTimeMessage$NetworkType": "

The network type of the DB instance.

The network type is determined by the DBSubnetGroup specified for the DB instance. A DBSubnetGroup can support only the IPv4 protocol or the IPv4 and the IPv6 protocols (DUAL).

For more information, see Working with a DB instance in a VPC in the Amazon RDS User Guide.

Valid Values:

", "RevokeDBSecurityGroupIngressMessage$DBSecurityGroupName": "

The name of the DB security group to revoke ingress from.

", "RevokeDBSecurityGroupIngressMessage$CIDRIP": "

The IP range to revoke access from. Must be a valid CIDR range. If CIDRIP is specified, EC2SecurityGroupName, EC2SecurityGroupId and EC2SecurityGroupOwnerId can't be provided.

", "RevokeDBSecurityGroupIngressMessage$EC2SecurityGroupName": "

The name of the EC2 security group to revoke access from. For VPC DB security groups, EC2SecurityGroupId must be provided. Otherwise, EC2SecurityGroupOwnerId and either EC2SecurityGroupName or EC2SecurityGroupId must be provided.

", @@ -5210,7 +5211,7 @@ "PendingModifiedValues$ResumeFullAutomationModeTime": "

The number of minutes to pause the automation. When the time period ends, RDS Custom resumes full automation. The minimum value is 60 (default). The maximum value is 1,440.

", "ReservedDBInstance$StartTime": "

The time the reservation started.

", "RestoreDBClusterToPointInTimeMessage$RestoreToTime": "

The date and time to restore the DB cluster to.

Valid Values: Value must be a time in Universal Coordinated Time (UTC) format

Constraints:

Example: 2015-03-07T23:45:00Z

Valid for: Aurora DB clusters and Multi-AZ DB clusters

", - "RestoreDBInstanceToPointInTimeMessage$RestoreTime": "

The date and time to restore from.

Valid Values: Value must be a time in Universal Coordinated Time (UTC) format

Constraints:

Example: 2009-09-07T23:45:00Z

", + "RestoreDBInstanceToPointInTimeMessage$RestoreTime": "

The date and time to restore from.

Constraints:

Example: 2009-09-07T23:45:00Z

", "RestoreWindow$EarliestTime": "

The earliest time you can restore an instance to.

", "RestoreWindow$LatestTime": "

The latest time you can restore an instance to.

" } diff --git a/models/apis/sso/2019-06-10/endpoint-rule-set-1.json b/models/apis/sso/2019-06-10/endpoint-rule-set-1.json new file mode 100644 index 00000000000..53820e93cdc --- /dev/null +++ b/models/apis/sso/2019-06-10/endpoint-rule-set-1.json @@ -0,0 +1,339 @@ +{ + "version": "1.0", + "parameters": { + "Region": { + "builtIn": "AWS::Region", + "required": false, + "documentation": "The AWS region used to dispatch the request.", + "type": "String" + }, + "UseDualStack": { + "builtIn": "AWS::UseDualStack", + "required": true, + "default": false, + "documentation": "When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.", + "type": "Boolean" + }, + "UseFIPS": { + "builtIn": "AWS::UseFIPS", + "required": true, + "default": false, + "documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.", + "type": "Boolean" + }, + "Endpoint": { + "builtIn": "SDK::Endpoint", + "required": false, + "documentation": "Override the endpoint used to send this request", + "type": "String" + } + }, + "rules": [ + { + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Endpoint" + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Region" + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "aws.partition", + "argv": [ + { + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://portal.sso-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + "aws-us-gov", + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "name" + ] + } + ] + } + ], + "endpoint": { + "url": "https://portal.sso.{Region}.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + }, + { + "conditions": [], + "endpoint": { + "url": "https://portal.sso-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://portal.sso.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" + } + ] + }, + { + "conditions": [], + "endpoint": { + "url": "https://portal.sso.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" + } + ] +} \ No newline at end of file diff --git a/models/apis/sso/2019-06-10/endpoint-tests-1.json b/models/apis/sso/2019-06-10/endpoint-tests-1.json new file mode 100644 index 00000000000..6edd17c4052 --- /dev/null +++ b/models/apis/sso/2019-06-10/endpoint-tests-1.json @@ -0,0 +1,561 @@ +{ + "testCases": [ + { + "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.ap-east-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.ap-northeast-3.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-3", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.ap-south-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-south-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.ca-central-1.amazonaws.com" + } + }, + "params": { + "Region": "ca-central-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.eu-central-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-central-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.eu-north-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-north-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.eu-south-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-south-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.eu-west-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.eu-west-2.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.eu-west-3.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-3", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.me-south-1.amazonaws.com" + } + }, + "params": { + "Region": "me-south-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.sa-east-1.amazonaws.com" + } + }, + "params": { + "Region": "sa-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.us-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.us-east-2.amazonaws.com" + } + }, + "params": { + "Region": "us-east-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.us-west-2.amazonaws.com" + } + }, + "params": { + "Region": "us-west-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://portal.sso-fips.us-east-1.api.aws" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso-fips.us-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.us-east-1.api.aws" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://portal.sso-fips.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso-fips.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.us-gov-west-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-west-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://portal.sso-fips.us-gov-east-1.api.aws" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.us-gov-east-1.api.aws" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso-fips.us-iso-east-1.c2s.ic.gov" + } + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "error": "DualStack is enabled but this partition does not support DualStack" + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.us-iso-east-1.c2s.ic.gov" + } + }, + "params": { + "Region": "us-iso-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso-fips.us-isob-east-1.sc2s.sgov.gov" + } + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "error": "DualStack is enabled but this partition does not support DualStack" + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://portal.sso.us-isob-east-1.sc2s.sgov.gov" + } + }, + "params": { + "Region": "us-isob-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { + "UseFIPS": false, + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips enabled and dualstack disabled", + "expect": { + "error": "Invalid Configuration: FIPS and custom endpoint are not supported" + }, + "params": { + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack enabled", + "expect": { + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "Missing region", + "expect": { + "error": "Invalid Configuration: Missing Region" + } + } + ], + "version": "1.0" +} \ No newline at end of file diff --git a/models/apis/sts/2011-06-15/api-2.json b/models/apis/sts/2011-06-15/api-2.json index 03f0bf2031a..fd11a3771a8 100644 --- a/models/apis/sts/2011-06-15/api-2.json +++ b/models/apis/sts/2011-06-15/api-2.json @@ -155,7 +155,7 @@ "RoleArn":{"shape":"arnType"}, "RoleSessionName":{"shape":"roleSessionNameType"}, "PolicyArns":{"shape":"policyDescriptorListType"}, - "Policy":{"shape":"sessionPolicyDocumentType"}, + "Policy":{"shape":"unrestrictedSessionPolicyDocumentType"}, "DurationSeconds":{"shape":"roleDurationSecondsType"}, "Tags":{"shape":"tagListType"}, "TransitiveTagKeys":{"shape":"tagKeyListType"}, @@ -611,6 +611,11 @@ "pattern":"[\\d]*" }, "tokenType":{"type":"string"}, + "unrestrictedSessionPolicyDocumentType":{ + "type":"string", + "min":1, + "pattern":"[\\u0009\\u000A\\u000D\\u0020-\\u00FF]+" + }, "urlType":{ "type":"string", "max":2048, diff --git a/models/apis/sts/2011-06-15/docs-2.json b/models/apis/sts/2011-06-15/docs-2.json index 8c368bc2f14..6a07f4c8db7 100644 --- a/models/apis/sts/2011-06-15/docs-2.json +++ b/models/apis/sts/2011-06-15/docs-2.json @@ -398,7 +398,6 @@ "sessionPolicyDocumentType": { "base": null, "refs": { - "AssumeRoleRequest$Policy": "

An IAM policy in JSON format that you want to use as an inline session policy.

This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent Amazon Web Services API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see Session Policies in the IAM User Guide.

The plaintext that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (\\u0020 through \\u00FF). It can also include the tab (\\u0009), linefeed (\\u000A), and carriage return (\\u000D) characters.

An Amazon Web Services conversion compresses the passed inline session policy, managed policy ARNs, and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plaintext meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.

", "AssumeRoleWithSAMLRequest$Policy": "

An IAM policy in JSON format that you want to use as an inline session policy.

This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent Amazon Web Services API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see Session Policies in the IAM User Guide.

The plaintext that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (\\u0020 through \\u00FF). It can also include the tab (\\u0009), linefeed (\\u000A), and carriage return (\\u000D) characters.

An Amazon Web Services conversion compresses the passed inline session policy, managed policy ARNs, and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plaintext meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.

", "AssumeRoleWithWebIdentityRequest$Policy": "

An IAM policy in JSON format that you want to use as an inline session policy.

This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent Amazon Web Services API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see Session Policies in the IAM User Guide.

The plaintext that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (\\u0020 through \\u00FF). It can also include the tab (\\u0009), linefeed (\\u000A), and carriage return (\\u000D) characters.

An Amazon Web Services conversion compresses the passed inline session policy, managed policy ARNs, and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plaintext meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.

", "GetFederationTokenRequest$Policy": "

An IAM policy in JSON format that you want to use as an inline session policy.

You must pass an inline or managed session policy to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policy Amazon Resource Names (ARNs) to use as managed session policies.

This parameter is optional. However, if you do not pass any session policies, then the resulting federated user session has no permissions.

When you pass session policies, the session permissions are the intersection of the IAM user policies and the session policies that you pass. This gives you a way to further restrict the permissions for a federated user. You cannot use session policies to grant more permissions than those that are defined in the permissions policy of the IAM user. For more information, see Session Policies in the IAM User Guide.

The resulting credentials can be used to access a resource that has a resource-based policy. If that policy specifically references the federated user session in the Principal element of the policy, the session has the permissions allowed by the policy. These permissions are granted in addition to the permissions that are granted by the session policies.

The plaintext that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (\\u0020 through \\u00FF). It can also include the tab (\\u0009), linefeed (\\u000A), and carriage return (\\u000D) characters.

An Amazon Web Services conversion compresses the passed inline session policy, managed policy ARNs, and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plaintext meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.

" @@ -452,6 +451,12 @@ "Credentials$SessionToken": "

The token that users must pass to the service API to use the temporary credentials.

" } }, + "unrestrictedSessionPolicyDocumentType": { + "base": null, + "refs": { + "AssumeRoleRequest$Policy": "

An IAM policy in JSON format that you want to use as an inline session policy.

This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent Amazon Web Services API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see Session Policies in the IAM User Guide.

The plaintext that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (\\u0020 through \\u00FF). It can also include the tab (\\u0009), linefeed (\\u000A), and carriage return (\\u000D) characters.

An Amazon Web Services conversion compresses the passed inline session policy, managed policy ARNs, and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plaintext meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.

" + } + }, "urlType": { "base": null, "refs": { diff --git a/models/apis/sts/2011-06-15/endpoint-rule-set-1.json b/models/apis/sts/2011-06-15/endpoint-rule-set-1.json index 97f64a7ba6c..959d2c0e836 100644 --- a/models/apis/sts/2011-06-15/endpoint-rule-set-1.json +++ b/models/apis/sts/2011-06-15/endpoint-rule-set-1.json @@ -578,52 +578,56 @@ "type": "error" }, { - "conditions": [], - "type": "tree", - "rules": [ + "conditions": [ { - "conditions": [ + "fn": "booleanEquals", + "argv": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" - }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" + "ref": "UseDualStack" }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" + true + ] } - ] + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, { - "conditions": [], + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Region" + } + ] + } + ], "type": "tree", "rules": [ { "conditions": [ { - "fn": "isSet", + "fn": "aws.partition", "argv": [ { "ref": "Region" } - ] + ], + "assign": "PartitionResult" } ], "type": "tree", @@ -631,13 +635,22 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "booleanEquals", "argv": [ { - "ref": "Region" - } - ], - "assign": "PartitionResult" + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] } ], "type": "tree", @@ -647,175 +660,83 @@ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - }, - { - "fn": "booleanEquals", - "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsDualStack" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ { - "conditions": [], - "endpoint": { - "url": "https://sts-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "ref": "PartitionResult" + }, + "supportsFIPS" ] } ] }, - { - "conditions": [], - "error": "FIPS and DualStack are enabled, but this partition does not support one or both", - "type": "error" - } - ] - }, - { - "conditions": [ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseFIPS" - }, - true - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", + "fn": "getAttr", "argv": [ - true, - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "supportsFIPS" - ] - } - ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ { - "conditions": [ - { - "fn": "stringEquals", - "argv": [ - "aws-us-gov", - { - "fn": "getAttr", - "argv": [ - { - "ref": "PartitionResult" - }, - "name" - ] - } - ] - } - ], - "endpoint": { - "url": "https://sts.{Region}.amazonaws.com", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "ref": "PartitionResult" }, - { - "conditions": [], - "endpoint": { - "url": "https://sts-fips.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } + "supportsDualStack" ] } ] - }, + } + ], + "type": "tree", + "rules": [ { "conditions": [], - "error": "FIPS is enabled but this partition does not support FIPS", - "type": "error" + "endpoint": { + "url": "https://sts-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "type": "tree", + "rules": [ { "conditions": [ { "fn": "booleanEquals", "argv": [ + true, { - "ref": "UseDualStack" - }, - true + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } ] } ], @@ -824,99 +745,142 @@ { "conditions": [ { - "fn": "booleanEquals", + "fn": "stringEquals", "argv": [ - true, + "aws-us-gov", { "fn": "getAttr", "argv": [ { "ref": "PartitionResult" }, - "supportsDualStack" + "name" ] } ] } ], - "type": "tree", - "rules": [ - { - "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://sts.{Region}.{PartitionResult#dualStackDnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] - } - ] + "endpoint": { + "url": "https://sts.{Region}.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" }, { "conditions": [], - "error": "DualStack is enabled but this partition does not support DualStack", - "type": "error" + "endpoint": { + "url": "https://sts-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] }, { "conditions": [], - "type": "tree", - "rules": [ + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ { - "conditions": [ + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, { - "fn": "stringEquals", + "fn": "getAttr", "argv": [ { - "ref": "Region" + "ref": "PartitionResult" }, - "aws-global" + "supportsDualStack" ] } - ], - "endpoint": { - "url": "https://sts.amazonaws.com", - "properties": { - "authSchemes": [ - { - "name": "sigv4", - "signingName": "sts", - "signingRegion": "us-east-1" - } - ] - }, - "headers": {} - }, - "type": "endpoint" - }, + ] + } + ], + "type": "tree", + "rules": [ { "conditions": [], "endpoint": { - "url": "https://sts.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://sts.{Region}.{PartitionResult#dualStackDnsSuffix}", "properties": {}, "headers": {} }, "type": "endpoint" } ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" } ] + }, + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + { + "ref": "Region" + }, + "aws-global" + ] + } + ], + "endpoint": { + "url": "https://sts.amazonaws.com", + "properties": { + "authSchemes": [ + { + "name": "sigv4", + "signingName": "sts", + "signingRegion": "us-east-1" + } + ] + }, + "headers": {} + }, + "type": "endpoint" + }, + { + "conditions": [], + "endpoint": { + "url": "https://sts.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, - { - "conditions": [], - "error": "Invalid Configuration: Missing Region", - "type": "error" } ] + }, + { + "conditions": [], + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } \ No newline at end of file diff --git a/models/apis/sts/2011-06-15/endpoint-tests-1.json b/models/apis/sts/2011-06-15/endpoint-tests-1.json index 5e12a28e224..52b2b64e809 100644 --- a/models/apis/sts/2011-06-15/endpoint-tests-1.json +++ b/models/apis/sts/2011-06-15/endpoint-tests-1.json @@ -702,9 +702,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -734,9 +734,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -766,9 +766,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -798,9 +798,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -830,9 +830,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -862,9 +862,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -894,9 +894,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -926,9 +926,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -958,9 +958,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -990,9 +990,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -1022,9 +1022,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -1054,9 +1054,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -1086,9 +1086,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -1118,9 +1118,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -1150,9 +1150,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -1182,9 +1182,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-1", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-1" + "name": "sigv4" } ] }, @@ -1214,9 +1214,9 @@ "properties": { "authSchemes": [ { + "signingRegion": "us-east-3", "signingName": "sts", - "name": "sigv4", - "signingRegion": "us-east-3" + "name": "sigv4" } ] }, @@ -1272,10 +1272,10 @@ } }, "params": { - "Endpoint": "https://example.com", "UseGlobalEndpoint": false, "UseDualStack": false, - "UseFIPS": false + "UseFIPS": false, + "Endpoint": "https://example.com" } } ], diff --git a/models/apis/transfer/2018-11-05/docs-2.json b/models/apis/transfer/2018-11-05/docs-2.json index 5af79c7f452..6f39f09dffc 100644 --- a/models/apis/transfer/2018-11-05/docs-2.json +++ b/models/apis/transfer/2018-11-05/docs-2.json @@ -50,7 +50,7 @@ "StartServer": "

Changes the state of a file transfer protocol-enabled server from OFFLINE to ONLINE. It has no impact on a server that is already ONLINE. An ONLINE server can accept and process file transfer jobs.

The state of STARTING indicates that the server is in an intermediate state, either not fully able to respond, or not fully online. The values of START_FAILED can indicate an error condition.

No response is returned from this call.

", "StopServer": "

Changes the state of a file transfer protocol-enabled server from ONLINE to OFFLINE. An OFFLINE server cannot accept and process file transfer jobs. Information tied to your server, such as server and user properties, are not affected by stopping your server.

Stopping the server does not reduce or impact your file transfer protocol endpoint billing; you must delete the server to stop being billed.

The state of STOPPING indicates that the server is in an intermediate state, either not fully able to respond, or not fully offline. The values of STOP_FAILED can indicate an error condition.

No response is returned from this call.

", "TagResource": "

Attaches a key-value pair to a resource, as identified by its Amazon Resource Name (ARN). Resources are users, servers, roles, and other entities.

There is no response returned from this call.

", - "TestConnection": "

Tests whether your SFTP connector is set up successfully. We highly recommend that you call this operation to test your ability to transfer files between a Transfer Family server and a trading partner's SFTP server.

", + "TestConnection": "

Tests whether your SFTP connector is set up successfully. We highly recommend that you call this operation to test your ability to transfer files between local Amazon Web Services storage and a trading partner's SFTP server.

", "TestIdentityProvider": "

If the IdentityProviderType of a file transfer protocol-enabled server is AWS_DIRECTORY_SERVICE or API_Gateway, tests whether your identity provider is set up successfully. We highly recommend that you call this operation to test your authentication method as soon as you create your server. By doing so, you can troubleshoot issues with the identity provider integration to ensure that your users can successfully use the service.

The ServerId and UserName parameters are required. The ServerProtocol, SourceIp, and UserPassword are all optional.

Note the following:

", "UntagResource": "

Detaches a key-value pair from a resource, as identified by its Amazon Resource Name (ARN). Resources are users, servers, roles, and other entities.

No response is returned from this call.

", "UpdateAccess": "

Allows you to update parameters for the access specified in the ServerID and ExternalID parameters.

", @@ -803,17 +803,17 @@ "HomeDirectory": { "base": null, "refs": { - "CreateAccessRequest$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

", + "CreateAccessRequest$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL.

", "CreateAgreementRequest$BaseDirectory": "

The landing directory (folder) for files transferred by using the AS2 protocol.

A BaseDirectory example is /DOC-EXAMPLE-BUCKET/home/mydirectory.

", - "CreateUserRequest$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

", - "DescribedAccess$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

", + "CreateUserRequest$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL.

", + "DescribedAccess$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL.

", "DescribedAgreement$BaseDirectory": "

The landing directory (folder) for files that are transferred by using the AS2 protocol.

", - "DescribedUser$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

", - "ListedAccess$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

", - "ListedUser$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

", - "UpdateAccessRequest$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

", + "DescribedUser$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL.

", + "ListedAccess$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL.

", + "ListedUser$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL.

", + "UpdateAccessRequest$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL.

", "UpdateAgreementRequest$BaseDirectory": "

To change the landing directory (folder) for files that are transferred, provide the bucket folder that you want to use; for example, /DOC-EXAMPLE-BUCKET/home/mydirectory .

", - "UpdateUserRequest$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

" + "UpdateUserRequest$HomeDirectory": "

The landing directory (folder) for a user when they log in to the server using the client.

A HomeDirectory example is /bucket_name/home/mydirectory.

The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL.

" } }, "HomeDirectoryMapEntry": { @@ -836,14 +836,14 @@ "HomeDirectoryType": { "base": null, "refs": { - "CreateAccessRequest$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or EFS paths as is in their file transfer protocol clients. If you set it LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

", - "CreateUserRequest$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or EFS paths as is in their file transfer protocol clients. If you set it LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

", - "DescribedAccess$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or EFS paths as is in their file transfer protocol clients. If you set it LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

", - "DescribedUser$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or EFS paths as is in their file transfer protocol clients. If you set it LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

", - "ListedAccess$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or EFS paths as is in their file transfer protocol clients. If you set it LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

", - "ListedUser$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or EFS paths as is in their file transfer protocol clients. If you set it LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

", - "UpdateAccessRequest$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or EFS paths as is in their file transfer protocol clients. If you set it LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

", - "UpdateUserRequest$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or EFS paths as is in their file transfer protocol clients. If you set it LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

" + "CreateAccessRequest$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or Amazon EFS path as is in their file transfer protocol clients. If you set it to LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings parameter. If, on the other hand, HomeDirectoryType is PATH, you provide an absolute path using the HomeDirectory parameter. You cannot have both HomeDirectory and HomeDirectoryMappings in your template.

", + "CreateUserRequest$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or Amazon EFS path as is in their file transfer protocol clients. If you set it to LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings parameter. If, on the other hand, HomeDirectoryType is PATH, you provide an absolute path using the HomeDirectory parameter. You cannot have both HomeDirectory and HomeDirectoryMappings in your template.

", + "DescribedAccess$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or Amazon EFS path as is in their file transfer protocol clients. If you set it to LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings parameter. If, on the other hand, HomeDirectoryType is PATH, you provide an absolute path using the HomeDirectory parameter. You cannot have both HomeDirectory and HomeDirectoryMappings in your template.

", + "DescribedUser$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or Amazon EFS path as is in their file transfer protocol clients. If you set it to LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings parameter. If, on the other hand, HomeDirectoryType is PATH, you provide an absolute path using the HomeDirectory parameter. You cannot have both HomeDirectory and HomeDirectoryMappings in your template.

", + "ListedAccess$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or Amazon EFS path as is in their file transfer protocol clients. If you set it to LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings parameter. If, on the other hand, HomeDirectoryType is PATH, you provide an absolute path using the HomeDirectory parameter. You cannot have both HomeDirectory and HomeDirectoryMappings in your template.

", + "ListedUser$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or Amazon EFS path as is in their file transfer protocol clients. If you set it to LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings parameter. If, on the other hand, HomeDirectoryType is PATH, you provide an absolute path using the HomeDirectory parameter. You cannot have both HomeDirectory and HomeDirectoryMappings in your template.

", + "UpdateAccessRequest$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or Amazon EFS path as is in their file transfer protocol clients. If you set it to LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings parameter. If, on the other hand, HomeDirectoryType is PATH, you provide an absolute path using the HomeDirectory parameter. You cannot have both HomeDirectory and HomeDirectoryMappings in your template.

", + "UpdateUserRequest$HomeDirectoryType": "

The type of landing directory (folder) that you want your users' home directory to be when they log in to the server. If you set it to PATH, the user will see the absolute Amazon S3 bucket or Amazon EFS path as is in their file transfer protocol clients. If you set it to LOGICAL, you need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS paths visible to your users.

If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings parameter. If, on the other hand, HomeDirectoryType is PATH, you provide an absolute path using the HomeDirectory parameter. You cannot have both HomeDirectory and HomeDirectoryMappings in your template.

" } }, "HostKey": { @@ -944,7 +944,7 @@ } }, "InternalServiceError": { - "base": "

This exception is thrown when an error occurs in the Amazon Web ServicesTransfer Family service.

", + "base": "

This exception is thrown when an error occurs in the Transfer Family service.

", "refs": { } }, @@ -1260,7 +1260,7 @@ "InvalidRequestException$Message": null, "ResourceExistsException$Message": null, "ResourceNotFoundException$Message": null, - "TestConnectionResponse$StatusMessage": "

Returns Connection succeeded if the test is successful. Or, returns a descriptive error message if the test fails. The following list provides the details for some error messages and troubleshooting steps for each.

", + "TestConnectionResponse$StatusMessage": "

Returns Connection succeeded if the test is successful. Or, returns a descriptive error message if the test fails. The following list provides troubleshooting details, depending on the error message that you receive.

", "TestIdentityProviderResponse$Message": "

A message that indicates whether the test was successful or not.

If an empty string is returned, the most likely cause is that the authentication failed due to an incorrect username or password.

" } }, @@ -1293,7 +1293,7 @@ "ListServersResponse$NextToken": "

When you can get additional results from the ListServers operation, a NextToken parameter is returned in the output. In a following command, you can pass in the NextToken parameter to continue listing additional servers.

", "ListTagsForResourceRequest$NextToken": "

When you request additional results from the ListTagsForResource operation, a NextToken parameter is returned in the input. You can then pass in a subsequent command to the NextToken parameter to continue listing additional tags.

", "ListTagsForResourceResponse$NextToken": "

When you can get additional results from the ListTagsForResource call, a NextToken parameter is returned in the output. You can then pass in a subsequent command to the NextToken parameter to continue listing additional tags.

", - "ListUsersRequest$NextToken": "

When you can get additional results from the ListUsers call, a NextToken parameter is returned in the output. You can then pass in a subsequent command to the NextToken parameter to continue listing additional users.

", + "ListUsersRequest$NextToken": "

If there are additional results from the ListUsers call, a NextToken parameter is returned in the output. You can then pass the NextToken to a subsequent ListUsers command, to continue listing additional users.

", "ListUsersResponse$NextToken": "

When you can get additional results from the ListUsers call, a NextToken parameter is returned in the output. You can then pass in a subsequent command to the NextToken parameter to continue listing additional users.

", "ListWorkflowsRequest$NextToken": "

ListWorkflows returns the NextToken parameter in the output. You can then pass the NextToken parameter in a subsequent command to continue listing additional workflows.

", "ListWorkflowsResponse$NextToken": "

ListWorkflows returns the NextToken parameter in the output. You can then pass the NextToken parameter in a subsequent command to continue listing additional workflows.

" @@ -1445,7 +1445,7 @@ } }, "ResourceExistsException": { - "base": "

The requested resource does not exist.

", + "base": "

The requested resource does not exist, or exists in a region other than the one specified for the command.

", "refs": { } }, @@ -1736,7 +1736,7 @@ "SftpConnectorTrustedHostKeyList": { "base": null, "refs": { - "SftpConnectorConfig$TrustedHostKeys": "

The public portion of the host key, or keys, that are used to authenticate the user to the external server to which you are connecting. You can use the ssh-keyscan command against the SFTP server to retrieve the necessary key.

The three standard SSH public key format elements are <key type>, <body base64>, and an optional <comment>, with spaces between each element.

For the trusted host key, Transfer Family accepts RSA and ECDSA keys.

" + "SftpConnectorConfig$TrustedHostKeys": "

The public portion of the host key, or keys, that are used to authenticate the user to the external server to which you are connecting. You can use the ssh-keyscan command against the SFTP server to retrieve the necessary key.

The three standard SSH public key format elements are <key type>, <body base64>, and an optional <comment>, with spaces between each element. Specify only the <key type> and <body base64>: do not enter the <comment> portion of the key.

For the trusted host key, Transfer Family accepts RSA and ECDSA keys.

" } }, "SigningAlg": { diff --git a/models/endpoints/endpoints.json b/models/endpoints/endpoints.json index 8cdfd18c8f0..43244e41f4e 100644 --- a/models/endpoints/endpoints.json +++ b/models/endpoints/endpoints.json @@ -2420,6 +2420,73 @@ } } }, + "bedrock" : { + "endpoints" : { + "ap-southeast-1" : { }, + "bedrock-ap-southeast-1" : { + "credentialScope" : { + "region" : "ap-southeast-1" + }, + "hostname" : "bedrock.ap-southeast-1.amazonaws.com" + }, + "bedrock-fips-us-east-1" : { + "credentialScope" : { + "region" : "us-east-1" + }, + "hostname" : "bedrock-fips.us-east-1.amazonaws.com" + }, + "bedrock-fips-us-west-2" : { + "credentialScope" : { + "region" : "us-west-2" + }, + "hostname" : "bedrock-fips.us-west-2.amazonaws.com" + }, + "bedrock-runtime-ap-southeast-1" : { + "credentialScope" : { + "region" : "ap-southeast-1" + }, + "hostname" : "bedrock-runtime.ap-southeast-1.amazonaws.com" + }, + "bedrock-runtime-fips-us-east-1" : { + "credentialScope" : { + "region" : "us-east-1" + }, + "hostname" : "bedrock-runtime-fips.us-east-1.amazonaws.com" + }, + "bedrock-runtime-fips-us-west-2" : { + "credentialScope" : { + "region" : "us-west-2" + }, + "hostname" : "bedrock-runtime-fips.us-west-2.amazonaws.com" + }, + "bedrock-runtime-us-east-1" : { + "credentialScope" : { + "region" : "us-east-1" + }, + "hostname" : "bedrock-runtime.us-east-1.amazonaws.com" + }, + "bedrock-runtime-us-west-2" : { + "credentialScope" : { + "region" : "us-west-2" + }, + "hostname" : "bedrock-runtime.us-west-2.amazonaws.com" + }, + "bedrock-us-east-1" : { + "credentialScope" : { + "region" : "us-east-1" + }, + "hostname" : "bedrock.us-east-1.amazonaws.com" + }, + "bedrock-us-west-2" : { + "credentialScope" : { + "region" : "us-west-2" + }, + "hostname" : "bedrock.us-west-2.amazonaws.com" + }, + "us-east-1" : { }, + "us-west-2" : { } + } + }, "billingconductor" : { "endpoints" : { "aws-global" : { @@ -10316,11 +10383,14 @@ "ap-northeast-2" : { }, "ap-northeast-3" : { }, "ap-south-1" : { }, + "ap-south-2" : { }, "ap-southeast-1" : { }, "ap-southeast-2" : { }, "ap-southeast-3" : { }, + "ap-southeast-4" : { }, "ca-central-1" : { }, "eu-central-1" : { }, + "eu-central-2" : { }, "eu-north-1" : { }, "eu-south-1" : { }, "eu-west-1" : { }, @@ -13446,6 +13516,9 @@ "ap-southeast-2" : { "hostname" : "resource-explorer-2.ap-southeast-2.api.aws" }, + "ap-southeast-3" : { + "hostname" : "resource-explorer-2.ap-southeast-3.api.aws" + }, "ap-southeast-4" : { "hostname" : "resource-explorer-2.ap-southeast-4.api.aws" }, @@ -13473,6 +13546,9 @@ "il-central-1" : { "hostname" : "resource-explorer-2.il-central-1.api.aws" }, + "me-south-1" : { + "hostname" : "resource-explorer-2.me-south-1.api.aws" + }, "sa-east-1" : { "hostname" : "resource-explorer-2.sa-east-1.api.aws" }, diff --git a/service/bedrock/api.go b/service/bedrock/api.go index 04237369600..a427d47b835 100644 --- a/service/bedrock/api.go +++ b/service/bedrock/api.go @@ -130,6 +130,110 @@ func (c *Bedrock) CreateModelCustomizationJobWithContext(ctx aws.Context, input return out, req.Send() } +const opCreateProvisionedModelThroughput = "CreateProvisionedModelThroughput" + +// CreateProvisionedModelThroughputRequest generates a "aws/request.Request" representing the +// client's request for the CreateProvisionedModelThroughput operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See CreateProvisionedModelThroughput for more information on using the CreateProvisionedModelThroughput +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the CreateProvisionedModelThroughputRequest method. +// req, resp := client.CreateProvisionedModelThroughputRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/CreateProvisionedModelThroughput +func (c *Bedrock) CreateProvisionedModelThroughputRequest(input *CreateProvisionedModelThroughputInput) (req *request.Request, output *CreateProvisionedModelThroughputOutput) { + op := &request.Operation{ + Name: opCreateProvisionedModelThroughput, + HTTPMethod: "POST", + HTTPPath: "/provisioned-model-throughput", + } + + if input == nil { + input = &CreateProvisionedModelThroughputInput{} + } + + output = &CreateProvisionedModelThroughputOutput{} + req = c.newRequest(op, input, output) + return +} + +// CreateProvisionedModelThroughput API operation for Amazon Bedrock. +// +// Creates a provisioned throughput with dedicated capacity for a foundation +// model or a fine-tuned model. +// +// For more information, see Provisioned throughput (https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-service.html) +// in the Bedrock User Guide. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon Bedrock's +// API operation CreateProvisionedModelThroughput for usage and error information. +// +// Returned Error Types: +// +// - ResourceNotFoundException +// The specified resource ARN was not found. Check the ARN and try your request +// again. +// +// - AccessDeniedException +// The request is denied because of missing access permissions. +// +// - ValidationException +// Input validation failed. Check your request parameters and retry the request. +// +// - InternalServerException +// An internal server error occurred. Retry your request. +// +// - TooManyTagsException +// The request contains more tags than can be associated with a resource (50 +// tags per resource). The maximum number of tags includes both existing tags +// and those included in your current request. +// +// - ServiceQuotaExceededException +// The number of requests exceeds the service quota. Resubmit your request later. +// +// - ThrottlingException +// The number of requests exceeds the limit. Resubmit your request later. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/CreateProvisionedModelThroughput +func (c *Bedrock) CreateProvisionedModelThroughput(input *CreateProvisionedModelThroughputInput) (*CreateProvisionedModelThroughputOutput, error) { + req, out := c.CreateProvisionedModelThroughputRequest(input) + return out, req.Send() +} + +// CreateProvisionedModelThroughputWithContext is the same as CreateProvisionedModelThroughput with the addition of +// the ability to pass a context and additional request options. +// +// See CreateProvisionedModelThroughput for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *Bedrock) CreateProvisionedModelThroughputWithContext(ctx aws.Context, input *CreateProvisionedModelThroughputInput, opts ...request.Option) (*CreateProvisionedModelThroughputOutput, error) { + req, out := c.CreateProvisionedModelThroughputRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeleteCustomModel = "DeleteCustomModel" // DeleteCustomModelRequest generates a "aws/request.Request" representing the @@ -314,6 +418,104 @@ func (c *Bedrock) DeleteModelInvocationLoggingConfigurationWithContext(ctx aws.C return out, req.Send() } +const opDeleteProvisionedModelThroughput = "DeleteProvisionedModelThroughput" + +// DeleteProvisionedModelThroughputRequest generates a "aws/request.Request" representing the +// client's request for the DeleteProvisionedModelThroughput operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See DeleteProvisionedModelThroughput for more information on using the DeleteProvisionedModelThroughput +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the DeleteProvisionedModelThroughputRequest method. +// req, resp := client.DeleteProvisionedModelThroughputRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/DeleteProvisionedModelThroughput +func (c *Bedrock) DeleteProvisionedModelThroughputRequest(input *DeleteProvisionedModelThroughputInput) (req *request.Request, output *DeleteProvisionedModelThroughputOutput) { + op := &request.Operation{ + Name: opDeleteProvisionedModelThroughput, + HTTPMethod: "DELETE", + HTTPPath: "/provisioned-model-throughput/{provisionedModelId}", + } + + if input == nil { + input = &DeleteProvisionedModelThroughputInput{} + } + + output = &DeleteProvisionedModelThroughputOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(restjson.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// DeleteProvisionedModelThroughput API operation for Amazon Bedrock. +// +// Deletes a provisioned throughput. For more information, see Provisioned throughput +// (https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-service.html) +// in the Bedrock User Guide. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon Bedrock's +// API operation DeleteProvisionedModelThroughput for usage and error information. +// +// Returned Error Types: +// +// - ResourceNotFoundException +// The specified resource ARN was not found. Check the ARN and try your request +// again. +// +// - AccessDeniedException +// The request is denied because of missing access permissions. +// +// - ValidationException +// Input validation failed. Check your request parameters and retry the request. +// +// - ConflictException +// Error occurred because of a conflict while performing an operation. +// +// - InternalServerException +// An internal server error occurred. Retry your request. +// +// - ThrottlingException +// The number of requests exceeds the limit. Resubmit your request later. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/DeleteProvisionedModelThroughput +func (c *Bedrock) DeleteProvisionedModelThroughput(input *DeleteProvisionedModelThroughputInput) (*DeleteProvisionedModelThroughputOutput, error) { + req, out := c.DeleteProvisionedModelThroughputRequest(input) + return out, req.Send() +} + +// DeleteProvisionedModelThroughputWithContext is the same as DeleteProvisionedModelThroughput with the addition of +// the ability to pass a context and additional request options. +// +// See DeleteProvisionedModelThroughput for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *Bedrock) DeleteProvisionedModelThroughputWithContext(ctx aws.Context, input *DeleteProvisionedModelThroughputInput, opts ...request.Option) (*DeleteProvisionedModelThroughputOutput, error) { + req, out := c.DeleteProvisionedModelThroughputRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opGetCustomModel = "GetCustomModel" // GetCustomModelRequest generates a "aws/request.Request" representing the @@ -679,6 +881,100 @@ func (c *Bedrock) GetModelInvocationLoggingConfigurationWithContext(ctx aws.Cont return out, req.Send() } +const opGetProvisionedModelThroughput = "GetProvisionedModelThroughput" + +// GetProvisionedModelThroughputRequest generates a "aws/request.Request" representing the +// client's request for the GetProvisionedModelThroughput operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See GetProvisionedModelThroughput for more information on using the GetProvisionedModelThroughput +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the GetProvisionedModelThroughputRequest method. +// req, resp := client.GetProvisionedModelThroughputRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/GetProvisionedModelThroughput +func (c *Bedrock) GetProvisionedModelThroughputRequest(input *GetProvisionedModelThroughputInput) (req *request.Request, output *GetProvisionedModelThroughputOutput) { + op := &request.Operation{ + Name: opGetProvisionedModelThroughput, + HTTPMethod: "GET", + HTTPPath: "/provisioned-model-throughput/{provisionedModelId}", + } + + if input == nil { + input = &GetProvisionedModelThroughputInput{} + } + + output = &GetProvisionedModelThroughputOutput{} + req = c.newRequest(op, input, output) + return +} + +// GetProvisionedModelThroughput API operation for Amazon Bedrock. +// +// Get details for a provisioned throughput. For more information, see Provisioned +// throughput (https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-service.html) +// in the Bedrock User Guide. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon Bedrock's +// API operation GetProvisionedModelThroughput for usage and error information. +// +// Returned Error Types: +// +// - ResourceNotFoundException +// The specified resource ARN was not found. Check the ARN and try your request +// again. +// +// - AccessDeniedException +// The request is denied because of missing access permissions. +// +// - ValidationException +// Input validation failed. Check your request parameters and retry the request. +// +// - InternalServerException +// An internal server error occurred. Retry your request. +// +// - ThrottlingException +// The number of requests exceeds the limit. Resubmit your request later. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/GetProvisionedModelThroughput +func (c *Bedrock) GetProvisionedModelThroughput(input *GetProvisionedModelThroughputInput) (*GetProvisionedModelThroughputOutput, error) { + req, out := c.GetProvisionedModelThroughputRequest(input) + return out, req.Send() +} + +// GetProvisionedModelThroughputWithContext is the same as GetProvisionedModelThroughput with the addition of +// the ability to pass a context and additional request options. +// +// See GetProvisionedModelThroughput for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *Bedrock) GetProvisionedModelThroughputWithContext(ctx aws.Context, input *GetProvisionedModelThroughputInput, opts ...request.Option) (*GetProvisionedModelThroughputOutput, error) { + req, out := c.GetProvisionedModelThroughputRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opListCustomModels = "ListCustomModels" // ListCustomModelsRequest generates a "aws/request.Request" representing the @@ -1067,52 +1363,57 @@ func (c *Bedrock) ListModelCustomizationJobsPagesWithContext(ctx aws.Context, in return p.Err() } -const opListTagsForResource = "ListTagsForResource" +const opListProvisionedModelThroughputs = "ListProvisionedModelThroughputs" -// ListTagsForResourceRequest generates a "aws/request.Request" representing the -// client's request for the ListTagsForResource operation. The "output" return +// ListProvisionedModelThroughputsRequest generates a "aws/request.Request" representing the +// client's request for the ListProvisionedModelThroughputs operation. The "output" return // value will be populated with the request's response once the request completes // successfully. // // Use "Send" method on the returned Request to send the API call to the service. // the "output" return value is not valid until after Send returns without error. // -// See ListTagsForResource for more information on using the ListTagsForResource +// See ListProvisionedModelThroughputs for more information on using the ListProvisionedModelThroughputs // API call, and error handling. // // This method is useful when you want to inject custom logic or configuration // into the SDK's request lifecycle. Such as custom headers, or retry logic. // -// // Example sending a request using the ListTagsForResourceRequest method. -// req, resp := client.ListTagsForResourceRequest(params) +// // Example sending a request using the ListProvisionedModelThroughputsRequest method. +// req, resp := client.ListProvisionedModelThroughputsRequest(params) // // err := req.Send() // if err == nil { // resp is now filled // fmt.Println(resp) // } // -// See also, https://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/ListTagsForResource -func (c *Bedrock) ListTagsForResourceRequest(input *ListTagsForResourceInput) (req *request.Request, output *ListTagsForResourceOutput) { +// See also, https://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/ListProvisionedModelThroughputs +func (c *Bedrock) ListProvisionedModelThroughputsRequest(input *ListProvisionedModelThroughputsInput) (req *request.Request, output *ListProvisionedModelThroughputsOutput) { op := &request.Operation{ - Name: opListTagsForResource, - HTTPMethod: "POST", - HTTPPath: "/listTagsForResource", + Name: opListProvisionedModelThroughputs, + HTTPMethod: "GET", + HTTPPath: "/provisioned-model-throughputs", + Paginator: &request.Paginator{ + InputTokens: []string{"nextToken"}, + OutputTokens: []string{"nextToken"}, + LimitToken: "maxResults", + TruncationToken: "", + }, } if input == nil { - input = &ListTagsForResourceInput{} + input = &ListProvisionedModelThroughputsInput{} } - output = &ListTagsForResourceOutput{} + output = &ListProvisionedModelThroughputsOutput{} req = c.newRequest(op, input, output) return } -// ListTagsForResource API operation for Amazon Bedrock. +// ListProvisionedModelThroughputs API operation for Amazon Bedrock. // -// List the tags associated with the specified resource. -// -// For more information, see Tagging resources (https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-service.html) +// List the provisioned capacities. For more information, see Provisioned throughput +// (https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-service.html) // in the Bedrock User Guide. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions @@ -1120,13 +1421,155 @@ func (c *Bedrock) ListTagsForResourceRequest(input *ListTagsForResourceInput) (r // the error. // // See the AWS API reference guide for Amazon Bedrock's -// API operation ListTagsForResource for usage and error information. +// API operation ListProvisionedModelThroughputs for usage and error information. // // Returned Error Types: // -// - ResourceNotFoundException -// The specified resource ARN was not found. Check the ARN and try your request -// again. +// - AccessDeniedException +// The request is denied because of missing access permissions. +// +// - ValidationException +// Input validation failed. Check your request parameters and retry the request. +// +// - InternalServerException +// An internal server error occurred. Retry your request. +// +// - ThrottlingException +// The number of requests exceeds the limit. Resubmit your request later. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/ListProvisionedModelThroughputs +func (c *Bedrock) ListProvisionedModelThroughputs(input *ListProvisionedModelThroughputsInput) (*ListProvisionedModelThroughputsOutput, error) { + req, out := c.ListProvisionedModelThroughputsRequest(input) + return out, req.Send() +} + +// ListProvisionedModelThroughputsWithContext is the same as ListProvisionedModelThroughputs with the addition of +// the ability to pass a context and additional request options. +// +// See ListProvisionedModelThroughputs for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *Bedrock) ListProvisionedModelThroughputsWithContext(ctx aws.Context, input *ListProvisionedModelThroughputsInput, opts ...request.Option) (*ListProvisionedModelThroughputsOutput, error) { + req, out := c.ListProvisionedModelThroughputsRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +// ListProvisionedModelThroughputsPages iterates over the pages of a ListProvisionedModelThroughputs operation, +// calling the "fn" function with the response data for each page. To stop +// iterating, return false from the fn function. +// +// See ListProvisionedModelThroughputs method for more information on how to use this operation. +// +// Note: This operation can generate multiple requests to a service. +// +// // Example iterating over at most 3 pages of a ListProvisionedModelThroughputs operation. +// pageNum := 0 +// err := client.ListProvisionedModelThroughputsPages(params, +// func(page *bedrock.ListProvisionedModelThroughputsOutput, lastPage bool) bool { +// pageNum++ +// fmt.Println(page) +// return pageNum <= 3 +// }) +func (c *Bedrock) ListProvisionedModelThroughputsPages(input *ListProvisionedModelThroughputsInput, fn func(*ListProvisionedModelThroughputsOutput, bool) bool) error { + return c.ListProvisionedModelThroughputsPagesWithContext(aws.BackgroundContext(), input, fn) +} + +// ListProvisionedModelThroughputsPagesWithContext same as ListProvisionedModelThroughputsPages except +// it takes a Context and allows setting request options on the pages. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *Bedrock) ListProvisionedModelThroughputsPagesWithContext(ctx aws.Context, input *ListProvisionedModelThroughputsInput, fn func(*ListProvisionedModelThroughputsOutput, bool) bool, opts ...request.Option) error { + p := request.Pagination{ + NewRequest: func() (*request.Request, error) { + var inCpy *ListProvisionedModelThroughputsInput + if input != nil { + tmp := *input + inCpy = &tmp + } + req, _ := c.ListProvisionedModelThroughputsRequest(inCpy) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return req, nil + }, + } + + for p.Next() { + if !fn(p.Page().(*ListProvisionedModelThroughputsOutput), !p.HasNextPage()) { + break + } + } + + return p.Err() +} + +const opListTagsForResource = "ListTagsForResource" + +// ListTagsForResourceRequest generates a "aws/request.Request" representing the +// client's request for the ListTagsForResource operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See ListTagsForResource for more information on using the ListTagsForResource +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the ListTagsForResourceRequest method. +// req, resp := client.ListTagsForResourceRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/ListTagsForResource +func (c *Bedrock) ListTagsForResourceRequest(input *ListTagsForResourceInput) (req *request.Request, output *ListTagsForResourceOutput) { + op := &request.Operation{ + Name: opListTagsForResource, + HTTPMethod: "POST", + HTTPPath: "/listTagsForResource", + } + + if input == nil { + input = &ListTagsForResourceInput{} + } + + output = &ListTagsForResourceOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListTagsForResource API operation for Amazon Bedrock. +// +// List the tags associated with the specified resource. +// +// For more information, see Tagging resources (https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-service.html) +// in the Bedrock User Guide. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon Bedrock's +// API operation ListTagsForResource for usage and error information. +// +// Returned Error Types: +// +// - ResourceNotFoundException +// The specified resource ARN was not found. Check the ARN and try your request +// again. // // - AccessDeniedException // The request is denied because of missing access permissions. @@ -1544,6 +1987,101 @@ func (c *Bedrock) UntagResourceWithContext(ctx aws.Context, input *UntagResource return out, req.Send() } +const opUpdateProvisionedModelThroughput = "UpdateProvisionedModelThroughput" + +// UpdateProvisionedModelThroughputRequest generates a "aws/request.Request" representing the +// client's request for the UpdateProvisionedModelThroughput operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See UpdateProvisionedModelThroughput for more information on using the UpdateProvisionedModelThroughput +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the UpdateProvisionedModelThroughputRequest method. +// req, resp := client.UpdateProvisionedModelThroughputRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/UpdateProvisionedModelThroughput +func (c *Bedrock) UpdateProvisionedModelThroughputRequest(input *UpdateProvisionedModelThroughputInput) (req *request.Request, output *UpdateProvisionedModelThroughputOutput) { + op := &request.Operation{ + Name: opUpdateProvisionedModelThroughput, + HTTPMethod: "PATCH", + HTTPPath: "/provisioned-model-throughput/{provisionedModelId}", + } + + if input == nil { + input = &UpdateProvisionedModelThroughputInput{} + } + + output = &UpdateProvisionedModelThroughputOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(restjson.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// UpdateProvisionedModelThroughput API operation for Amazon Bedrock. +// +// Update a provisioned throughput. For more information, see Provisioned throughput +// (https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-service.html) +// in the Bedrock User Guide. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for Amazon Bedrock's +// API operation UpdateProvisionedModelThroughput for usage and error information. +// +// Returned Error Types: +// +// - ResourceNotFoundException +// The specified resource ARN was not found. Check the ARN and try your request +// again. +// +// - AccessDeniedException +// The request is denied because of missing access permissions. +// +// - ValidationException +// Input validation failed. Check your request parameters and retry the request. +// +// - InternalServerException +// An internal server error occurred. Retry your request. +// +// - ThrottlingException +// The number of requests exceeds the limit. Resubmit your request later. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/bedrock-2023-04-20/UpdateProvisionedModelThroughput +func (c *Bedrock) UpdateProvisionedModelThroughput(input *UpdateProvisionedModelThroughputInput) (*UpdateProvisionedModelThroughputOutput, error) { + req, out := c.UpdateProvisionedModelThroughputRequest(input) + return out, req.Send() +} + +// UpdateProvisionedModelThroughputWithContext is the same as UpdateProvisionedModelThroughput with the addition of +// the ability to pass a context and additional request options. +// +// See UpdateProvisionedModelThroughput for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *Bedrock) UpdateProvisionedModelThroughputWithContext(ctx aws.Context, input *UpdateProvisionedModelThroughputInput, opts ...request.Option) (*UpdateProvisionedModelThroughputOutput, error) { + req, out := c.UpdateProvisionedModelThroughputRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + // The request is denied because of missing access permissions. type AccessDeniedException struct { _ struct{} `type:"structure"` @@ -2028,34 +2566,33 @@ func (s *CreateModelCustomizationJobOutput) SetJobArn(v string) *CreateModelCust return s } -// Summary information for a custom model. -type CustomModelSummary struct { +type CreateProvisionedModelThroughputInput struct { _ struct{} `type:"structure"` - // The base model ARN. - // - // BaseModelArn is a required field - BaseModelArn *string `locationName:"baseModelArn" min:"20" type:"string" required:"true"` + // Unique token value that you can provide. If this token matches a previous + // request, Bedrock ignores the request, but does not return an error. + ClientRequestToken *string `locationName:"clientRequestToken" min:"1" type:"string" idempotencyToken:"true"` - // The base model name. - // - // BaseModelName is a required field - BaseModelName *string `locationName:"baseModelName" min:"1" type:"string" required:"true"` + // Commitment duration requested for the provisioned throughput. + CommitmentDuration *string `locationName:"commitmentDuration" type:"string" enum:"CommitmentDuration"` - // Creation time of the model. + // Name or ARN of the model to associate with this provisioned throughput. // - // CreationTime is a required field - CreationTime *time.Time `locationName:"creationTime" type:"timestamp" timestampFormat:"iso8601" required:"true"` + // ModelId is a required field + ModelId *string `locationName:"modelId" min:"1" type:"string" required:"true"` - // The ARN of the custom model. + // Number of model units to allocate. // - // ModelArn is a required field - ModelArn *string `locationName:"modelArn" min:"20" type:"string" required:"true"` + // ModelUnits is a required field + ModelUnits *int64 `locationName:"modelUnits" min:"1" type:"integer" required:"true"` - // The name of the custom model. + // Unique name for this provisioned throughput. // - // ModelName is a required field - ModelName *string `locationName:"modelName" min:"1" type:"string" required:"true"` + // ProvisionedModelName is a required field + ProvisionedModelName *string `locationName:"provisionedModelName" min:"1" type:"string" required:"true"` + + // Tags to associate with this provisioned throughput. + Tags []*Tag `locationName:"tags" type:"list"` } // String returns the string representation. @@ -2063,7 +2600,7 @@ type CustomModelSummary struct { // API parameter values that are decorated as "sensitive" in the API will not // be included in the string output. The member name will be present, but the // value will be replaced with "sensitive". -func (s CustomModelSummary) String() string { +func (s CreateProvisionedModelThroughputInput) String() string { return awsutil.Prettify(s) } @@ -2072,20 +2609,178 @@ func (s CustomModelSummary) String() string { // API parameter values that are decorated as "sensitive" in the API will not // be included in the string output. The member name will be present, but the // value will be replaced with "sensitive". -func (s CustomModelSummary) GoString() string { +func (s CreateProvisionedModelThroughputInput) GoString() string { return s.String() } -// SetBaseModelArn sets the BaseModelArn field's value. -func (s *CustomModelSummary) SetBaseModelArn(v string) *CustomModelSummary { - s.BaseModelArn = &v - return s -} +// Validate inspects the fields of the type to determine if they are valid. +func (s *CreateProvisionedModelThroughputInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "CreateProvisionedModelThroughputInput"} + if s.ClientRequestToken != nil && len(*s.ClientRequestToken) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ClientRequestToken", 1)) + } + if s.ModelId == nil { + invalidParams.Add(request.NewErrParamRequired("ModelId")) + } + if s.ModelId != nil && len(*s.ModelId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ModelId", 1)) + } + if s.ModelUnits == nil { + invalidParams.Add(request.NewErrParamRequired("ModelUnits")) + } + if s.ModelUnits != nil && *s.ModelUnits < 1 { + invalidParams.Add(request.NewErrParamMinValue("ModelUnits", 1)) + } + if s.ProvisionedModelName == nil { + invalidParams.Add(request.NewErrParamRequired("ProvisionedModelName")) + } + if s.ProvisionedModelName != nil && len(*s.ProvisionedModelName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ProvisionedModelName", 1)) + } + if s.Tags != nil { + for i, v := range s.Tags { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Tags", i), err.(request.ErrInvalidParams)) + } + } + } -// SetBaseModelName sets the BaseModelName field's value. -func (s *CustomModelSummary) SetBaseModelName(v string) *CustomModelSummary { - s.BaseModelName = &v - return s + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetClientRequestToken sets the ClientRequestToken field's value. +func (s *CreateProvisionedModelThroughputInput) SetClientRequestToken(v string) *CreateProvisionedModelThroughputInput { + s.ClientRequestToken = &v + return s +} + +// SetCommitmentDuration sets the CommitmentDuration field's value. +func (s *CreateProvisionedModelThroughputInput) SetCommitmentDuration(v string) *CreateProvisionedModelThroughputInput { + s.CommitmentDuration = &v + return s +} + +// SetModelId sets the ModelId field's value. +func (s *CreateProvisionedModelThroughputInput) SetModelId(v string) *CreateProvisionedModelThroughputInput { + s.ModelId = &v + return s +} + +// SetModelUnits sets the ModelUnits field's value. +func (s *CreateProvisionedModelThroughputInput) SetModelUnits(v int64) *CreateProvisionedModelThroughputInput { + s.ModelUnits = &v + return s +} + +// SetProvisionedModelName sets the ProvisionedModelName field's value. +func (s *CreateProvisionedModelThroughputInput) SetProvisionedModelName(v string) *CreateProvisionedModelThroughputInput { + s.ProvisionedModelName = &v + return s +} + +// SetTags sets the Tags field's value. +func (s *CreateProvisionedModelThroughputInput) SetTags(v []*Tag) *CreateProvisionedModelThroughputInput { + s.Tags = v + return s +} + +type CreateProvisionedModelThroughputOutput struct { + _ struct{} `type:"structure"` + + // The ARN for this provisioned throughput. + // + // ProvisionedModelArn is a required field + ProvisionedModelArn *string `locationName:"provisionedModelArn" type:"string" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s CreateProvisionedModelThroughputOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s CreateProvisionedModelThroughputOutput) GoString() string { + return s.String() +} + +// SetProvisionedModelArn sets the ProvisionedModelArn field's value. +func (s *CreateProvisionedModelThroughputOutput) SetProvisionedModelArn(v string) *CreateProvisionedModelThroughputOutput { + s.ProvisionedModelArn = &v + return s +} + +// Summary information for a custom model. +type CustomModelSummary struct { + _ struct{} `type:"structure"` + + // The base model ARN. + // + // BaseModelArn is a required field + BaseModelArn *string `locationName:"baseModelArn" min:"20" type:"string" required:"true"` + + // The base model name. + // + // BaseModelName is a required field + BaseModelName *string `locationName:"baseModelName" min:"1" type:"string" required:"true"` + + // Creation time of the model. + // + // CreationTime is a required field + CreationTime *time.Time `locationName:"creationTime" type:"timestamp" timestampFormat:"iso8601" required:"true"` + + // The ARN of the custom model. + // + // ModelArn is a required field + ModelArn *string `locationName:"modelArn" min:"20" type:"string" required:"true"` + + // The name of the custom model. + // + // ModelName is a required field + ModelName *string `locationName:"modelName" min:"1" type:"string" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s CustomModelSummary) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s CustomModelSummary) GoString() string { + return s.String() +} + +// SetBaseModelArn sets the BaseModelArn field's value. +func (s *CustomModelSummary) SetBaseModelArn(v string) *CustomModelSummary { + s.BaseModelArn = &v + return s +} + +// SetBaseModelName sets the BaseModelName field's value. +func (s *CustomModelSummary) SetBaseModelName(v string) *CustomModelSummary { + s.BaseModelName = &v + return s } // SetCreationTime sets the CreationTime field's value. @@ -2221,6 +2916,77 @@ func (s DeleteModelInvocationLoggingConfigurationOutput) GoString() string { return s.String() } +type DeleteProvisionedModelThroughputInput struct { + _ struct{} `type:"structure" nopayload:"true"` + + // The ARN or name of the provisioned throughput. + // + // ProvisionedModelId is a required field + ProvisionedModelId *string `location:"uri" locationName:"provisionedModelId" type:"string" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DeleteProvisionedModelThroughputInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DeleteProvisionedModelThroughputInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteProvisionedModelThroughputInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteProvisionedModelThroughputInput"} + if s.ProvisionedModelId == nil { + invalidParams.Add(request.NewErrParamRequired("ProvisionedModelId")) + } + if s.ProvisionedModelId != nil && len(*s.ProvisionedModelId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ProvisionedModelId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetProvisionedModelId sets the ProvisionedModelId field's value. +func (s *DeleteProvisionedModelThroughputInput) SetProvisionedModelId(v string) *DeleteProvisionedModelThroughputInput { + s.ProvisionedModelId = &v + return s +} + +type DeleteProvisionedModelThroughputOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DeleteProvisionedModelThroughputOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DeleteProvisionedModelThroughputOutput) GoString() string { + return s.String() +} + // Information about a foundation model. type FoundationModelDetails struct { _ struct{} `type:"structure"` @@ -3045,6 +3811,216 @@ func (s *GetModelInvocationLoggingConfigurationOutput) SetLoggingConfig(v *Loggi return s } +type GetProvisionedModelThroughputInput struct { + _ struct{} `type:"structure" nopayload:"true"` + + // The ARN or name of the provisioned throughput. + // + // ProvisionedModelId is a required field + ProvisionedModelId *string `location:"uri" locationName:"provisionedModelId" type:"string" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s GetProvisionedModelThroughputInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s GetProvisionedModelThroughputInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *GetProvisionedModelThroughputInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "GetProvisionedModelThroughputInput"} + if s.ProvisionedModelId == nil { + invalidParams.Add(request.NewErrParamRequired("ProvisionedModelId")) + } + if s.ProvisionedModelId != nil && len(*s.ProvisionedModelId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ProvisionedModelId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetProvisionedModelId sets the ProvisionedModelId field's value. +func (s *GetProvisionedModelThroughputInput) SetProvisionedModelId(v string) *GetProvisionedModelThroughputInput { + s.ProvisionedModelId = &v + return s +} + +type GetProvisionedModelThroughputOutput struct { + _ struct{} `type:"structure"` + + // Commitment duration of the provisioned throughput. + CommitmentDuration *string `locationName:"commitmentDuration" type:"string" enum:"CommitmentDuration"` + + // Commitment expiration time for the provisioned throughput. + CommitmentExpirationTime *time.Time `locationName:"commitmentExpirationTime" type:"timestamp" timestampFormat:"iso8601"` + + // The timestamp of the creation time for this provisioned throughput. + // + // CreationTime is a required field + CreationTime *time.Time `locationName:"creationTime" type:"timestamp" timestampFormat:"iso8601" required:"true"` + + // The ARN of the new model to asssociate with this provisioned throughput. + // + // DesiredModelArn is a required field + DesiredModelArn *string `locationName:"desiredModelArn" min:"20" type:"string" required:"true"` + + // The desired number of model units that was requested to be available for + // this provisioned throughput. + // + // DesiredModelUnits is a required field + DesiredModelUnits *int64 `locationName:"desiredModelUnits" min:"1" type:"integer" required:"true"` + + // Failure message for any issues that the create operation encounters. + FailureMessage *string `locationName:"failureMessage" type:"string"` + + // ARN of the foundation model. + // + // FoundationModelArn is a required field + FoundationModelArn *string `locationName:"foundationModelArn" type:"string" required:"true"` + + // The timestamp of the last modified time of this provisioned throughput. + // + // LastModifiedTime is a required field + LastModifiedTime *time.Time `locationName:"lastModifiedTime" type:"timestamp" timestampFormat:"iso8601" required:"true"` + + // The ARN or name of the model associated with this provisioned throughput. + // + // ModelArn is a required field + ModelArn *string `locationName:"modelArn" min:"20" type:"string" required:"true"` + + // The current number of model units requested to be available for this provisioned + // throughput. + // + // ModelUnits is a required field + ModelUnits *int64 `locationName:"modelUnits" min:"1" type:"integer" required:"true"` + + // The ARN of the provisioned throughput. + // + // ProvisionedModelArn is a required field + ProvisionedModelArn *string `locationName:"provisionedModelArn" type:"string" required:"true"` + + // The name of the provisioned throughput. + // + // ProvisionedModelName is a required field + ProvisionedModelName *string `locationName:"provisionedModelName" min:"1" type:"string" required:"true"` + + // Status of the provisioned throughput. + // + // Status is a required field + Status *string `locationName:"status" type:"string" required:"true" enum:"ProvisionedModelStatus"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s GetProvisionedModelThroughputOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s GetProvisionedModelThroughputOutput) GoString() string { + return s.String() +} + +// SetCommitmentDuration sets the CommitmentDuration field's value. +func (s *GetProvisionedModelThroughputOutput) SetCommitmentDuration(v string) *GetProvisionedModelThroughputOutput { + s.CommitmentDuration = &v + return s +} + +// SetCommitmentExpirationTime sets the CommitmentExpirationTime field's value. +func (s *GetProvisionedModelThroughputOutput) SetCommitmentExpirationTime(v time.Time) *GetProvisionedModelThroughputOutput { + s.CommitmentExpirationTime = &v + return s +} + +// SetCreationTime sets the CreationTime field's value. +func (s *GetProvisionedModelThroughputOutput) SetCreationTime(v time.Time) *GetProvisionedModelThroughputOutput { + s.CreationTime = &v + return s +} + +// SetDesiredModelArn sets the DesiredModelArn field's value. +func (s *GetProvisionedModelThroughputOutput) SetDesiredModelArn(v string) *GetProvisionedModelThroughputOutput { + s.DesiredModelArn = &v + return s +} + +// SetDesiredModelUnits sets the DesiredModelUnits field's value. +func (s *GetProvisionedModelThroughputOutput) SetDesiredModelUnits(v int64) *GetProvisionedModelThroughputOutput { + s.DesiredModelUnits = &v + return s +} + +// SetFailureMessage sets the FailureMessage field's value. +func (s *GetProvisionedModelThroughputOutput) SetFailureMessage(v string) *GetProvisionedModelThroughputOutput { + s.FailureMessage = &v + return s +} + +// SetFoundationModelArn sets the FoundationModelArn field's value. +func (s *GetProvisionedModelThroughputOutput) SetFoundationModelArn(v string) *GetProvisionedModelThroughputOutput { + s.FoundationModelArn = &v + return s +} + +// SetLastModifiedTime sets the LastModifiedTime field's value. +func (s *GetProvisionedModelThroughputOutput) SetLastModifiedTime(v time.Time) *GetProvisionedModelThroughputOutput { + s.LastModifiedTime = &v + return s +} + +// SetModelArn sets the ModelArn field's value. +func (s *GetProvisionedModelThroughputOutput) SetModelArn(v string) *GetProvisionedModelThroughputOutput { + s.ModelArn = &v + return s +} + +// SetModelUnits sets the ModelUnits field's value. +func (s *GetProvisionedModelThroughputOutput) SetModelUnits(v int64) *GetProvisionedModelThroughputOutput { + s.ModelUnits = &v + return s +} + +// SetProvisionedModelArn sets the ProvisionedModelArn field's value. +func (s *GetProvisionedModelThroughputOutput) SetProvisionedModelArn(v string) *GetProvisionedModelThroughputOutput { + s.ProvisionedModelArn = &v + return s +} + +// SetProvisionedModelName sets the ProvisionedModelName field's value. +func (s *GetProvisionedModelThroughputOutput) SetProvisionedModelName(v string) *GetProvisionedModelThroughputOutput { + s.ProvisionedModelName = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *GetProvisionedModelThroughputOutput) SetStatus(v string) *GetProvisionedModelThroughputOutput { + s.Status = &v + return s +} + // An internal server error occurred. Retry your request. type InternalServerException struct { _ struct{} `type:"structure"` @@ -3327,17 +4303,165 @@ func (s *ListFoundationModelsInput) SetByOutputModality(v string) *ListFoundatio return s } -// SetByProvider sets the ByProvider field's value. -func (s *ListFoundationModelsInput) SetByProvider(v string) *ListFoundationModelsInput { - s.ByProvider = &v +// SetByProvider sets the ByProvider field's value. +func (s *ListFoundationModelsInput) SetByProvider(v string) *ListFoundationModelsInput { + s.ByProvider = &v + return s +} + +type ListFoundationModelsOutput struct { + _ struct{} `type:"structure"` + + // A list of bedrock foundation models. + ModelSummaries []*FoundationModelSummary `locationName:"modelSummaries" type:"list"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListFoundationModelsOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListFoundationModelsOutput) GoString() string { + return s.String() +} + +// SetModelSummaries sets the ModelSummaries field's value. +func (s *ListFoundationModelsOutput) SetModelSummaries(v []*FoundationModelSummary) *ListFoundationModelsOutput { + s.ModelSummaries = v + return s +} + +type ListModelCustomizationJobsInput struct { + _ struct{} `type:"structure" nopayload:"true"` + + // Return customization jobs created after the specified time. + CreationTimeAfter *time.Time `location:"querystring" locationName:"creationTimeAfter" type:"timestamp" timestampFormat:"iso8601"` + + // Return customization jobs created before the specified time. + CreationTimeBefore *time.Time `location:"querystring" locationName:"creationTimeBefore" type:"timestamp" timestampFormat:"iso8601"` + + // Maximum number of results to return in the response. + MaxResults *int64 `location:"querystring" locationName:"maxResults" min:"1" type:"integer"` + + // Return customization jobs only if the job name contains these characters. + NameContains *string `location:"querystring" locationName:"nameContains" min:"1" type:"string"` + + // Continuation token from the previous response, for Bedrock to list the next + // set of results. + NextToken *string `location:"querystring" locationName:"nextToken" min:"1" type:"string"` + + // The field to sort by in the returned list of jobs. + SortBy *string `location:"querystring" locationName:"sortBy" type:"string" enum:"SortJobsBy"` + + // The sort order of the results. + SortOrder *string `location:"querystring" locationName:"sortOrder" type:"string" enum:"SortOrder"` + + // Return customization jobs with the specified status. + StatusEquals *string `location:"querystring" locationName:"statusEquals" type:"string" enum:"FineTuningJobStatus"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListModelCustomizationJobsInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListModelCustomizationJobsInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListModelCustomizationJobsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListModelCustomizationJobsInput"} + if s.MaxResults != nil && *s.MaxResults < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) + } + if s.NameContains != nil && len(*s.NameContains) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NameContains", 1)) + } + if s.NextToken != nil && len(*s.NextToken) < 1 { + invalidParams.Add(request.NewErrParamMinLen("NextToken", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetCreationTimeAfter sets the CreationTimeAfter field's value. +func (s *ListModelCustomizationJobsInput) SetCreationTimeAfter(v time.Time) *ListModelCustomizationJobsInput { + s.CreationTimeAfter = &v + return s +} + +// SetCreationTimeBefore sets the CreationTimeBefore field's value. +func (s *ListModelCustomizationJobsInput) SetCreationTimeBefore(v time.Time) *ListModelCustomizationJobsInput { + s.CreationTimeBefore = &v + return s +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListModelCustomizationJobsInput) SetMaxResults(v int64) *ListModelCustomizationJobsInput { + s.MaxResults = &v + return s +} + +// SetNameContains sets the NameContains field's value. +func (s *ListModelCustomizationJobsInput) SetNameContains(v string) *ListModelCustomizationJobsInput { + s.NameContains = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListModelCustomizationJobsInput) SetNextToken(v string) *ListModelCustomizationJobsInput { + s.NextToken = &v + return s +} + +// SetSortBy sets the SortBy field's value. +func (s *ListModelCustomizationJobsInput) SetSortBy(v string) *ListModelCustomizationJobsInput { + s.SortBy = &v + return s +} + +// SetSortOrder sets the SortOrder field's value. +func (s *ListModelCustomizationJobsInput) SetSortOrder(v string) *ListModelCustomizationJobsInput { + s.SortOrder = &v + return s +} + +// SetStatusEquals sets the StatusEquals field's value. +func (s *ListModelCustomizationJobsInput) SetStatusEquals(v string) *ListModelCustomizationJobsInput { + s.StatusEquals = &v return s } -type ListFoundationModelsOutput struct { +type ListModelCustomizationJobsOutput struct { _ struct{} `type:"structure"` - // A list of bedrock foundation models. - ModelSummaries []*FoundationModelSummary `locationName:"modelSummaries" type:"list"` + // Job summaries. + ModelCustomizationJobSummaries []*ModelCustomizationJobSummary `locationName:"modelCustomizationJobSummaries" type:"list"` + + // Page continuation token to use in the next request. + NextToken *string `locationName:"nextToken" min:"1" type:"string"` } // String returns the string representation. @@ -3345,7 +4469,7 @@ type ListFoundationModelsOutput struct { // API parameter values that are decorated as "sensitive" in the API will not // be included in the string output. The member name will be present, but the // value will be replaced with "sensitive". -func (s ListFoundationModelsOutput) String() string { +func (s ListModelCustomizationJobsOutput) String() string { return awsutil.Prettify(s) } @@ -3354,43 +4478,53 @@ func (s ListFoundationModelsOutput) String() string { // API parameter values that are decorated as "sensitive" in the API will not // be included in the string output. The member name will be present, but the // value will be replaced with "sensitive". -func (s ListFoundationModelsOutput) GoString() string { +func (s ListModelCustomizationJobsOutput) GoString() string { return s.String() } -// SetModelSummaries sets the ModelSummaries field's value. -func (s *ListFoundationModelsOutput) SetModelSummaries(v []*FoundationModelSummary) *ListFoundationModelsOutput { - s.ModelSummaries = v +// SetModelCustomizationJobSummaries sets the ModelCustomizationJobSummaries field's value. +func (s *ListModelCustomizationJobsOutput) SetModelCustomizationJobSummaries(v []*ModelCustomizationJobSummary) *ListModelCustomizationJobsOutput { + s.ModelCustomizationJobSummaries = v return s } -type ListModelCustomizationJobsInput struct { +// SetNextToken sets the NextToken field's value. +func (s *ListModelCustomizationJobsOutput) SetNextToken(v string) *ListModelCustomizationJobsOutput { + s.NextToken = &v + return s +} + +type ListProvisionedModelThroughputsInput struct { _ struct{} `type:"structure" nopayload:"true"` - // Return customization jobs created after the specified time. + // Return provisioned capacities created after the specified time. CreationTimeAfter *time.Time `location:"querystring" locationName:"creationTimeAfter" type:"timestamp" timestampFormat:"iso8601"` - // Return customization jobs created before the specified time. + // Return provisioned capacities created before the specified time. CreationTimeBefore *time.Time `location:"querystring" locationName:"creationTimeBefore" type:"timestamp" timestampFormat:"iso8601"` - // Maximum number of results to return in the response. + // THe maximum number of results to return in the response. MaxResults *int64 `location:"querystring" locationName:"maxResults" min:"1" type:"integer"` - // Return customization jobs only if the job name contains these characters. + // Return the list of provisioned capacities where their model ARN is equal + // to this parameter. + ModelArnEquals *string `location:"querystring" locationName:"modelArnEquals" min:"20" type:"string"` + + // Return the list of provisioned capacities if their name contains these characters. NameContains *string `location:"querystring" locationName:"nameContains" min:"1" type:"string"` // Continuation token from the previous response, for Bedrock to list the next // set of results. NextToken *string `location:"querystring" locationName:"nextToken" min:"1" type:"string"` - // The field to sort by in the returned list of jobs. - SortBy *string `location:"querystring" locationName:"sortBy" type:"string" enum:"SortJobsBy"` + // The field to sort by in the returned list of provisioned capacities. + SortBy *string `location:"querystring" locationName:"sortBy" type:"string" enum:"SortByProvisionedModels"` // The sort order of the results. SortOrder *string `location:"querystring" locationName:"sortOrder" type:"string" enum:"SortOrder"` - // Return customization jobs with the specified status. - StatusEquals *string `location:"querystring" locationName:"statusEquals" type:"string" enum:"FineTuningJobStatus"` + // Return the list of provisioned capacities that match the specified status. + StatusEquals *string `location:"querystring" locationName:"statusEquals" type:"string" enum:"ProvisionedModelStatus"` } // String returns the string representation. @@ -3398,7 +4532,7 @@ type ListModelCustomizationJobsInput struct { // API parameter values that are decorated as "sensitive" in the API will not // be included in the string output. The member name will be present, but the // value will be replaced with "sensitive". -func (s ListModelCustomizationJobsInput) String() string { +func (s ListProvisionedModelThroughputsInput) String() string { return awsutil.Prettify(s) } @@ -3407,16 +4541,19 @@ func (s ListModelCustomizationJobsInput) String() string { // API parameter values that are decorated as "sensitive" in the API will not // be included in the string output. The member name will be present, but the // value will be replaced with "sensitive". -func (s ListModelCustomizationJobsInput) GoString() string { +func (s ListProvisionedModelThroughputsInput) GoString() string { return s.String() } // Validate inspects the fields of the type to determine if they are valid. -func (s *ListModelCustomizationJobsInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "ListModelCustomizationJobsInput"} +func (s *ListProvisionedModelThroughputsInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListProvisionedModelThroughputsInput"} if s.MaxResults != nil && *s.MaxResults < 1 { invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) } + if s.ModelArnEquals != nil && len(*s.ModelArnEquals) < 20 { + invalidParams.Add(request.NewErrParamMinLen("ModelArnEquals", 20)) + } if s.NameContains != nil && len(*s.NameContains) < 1 { invalidParams.Add(request.NewErrParamMinLen("NameContains", 1)) } @@ -3431,61 +4568,67 @@ func (s *ListModelCustomizationJobsInput) Validate() error { } // SetCreationTimeAfter sets the CreationTimeAfter field's value. -func (s *ListModelCustomizationJobsInput) SetCreationTimeAfter(v time.Time) *ListModelCustomizationJobsInput { +func (s *ListProvisionedModelThroughputsInput) SetCreationTimeAfter(v time.Time) *ListProvisionedModelThroughputsInput { s.CreationTimeAfter = &v return s } // SetCreationTimeBefore sets the CreationTimeBefore field's value. -func (s *ListModelCustomizationJobsInput) SetCreationTimeBefore(v time.Time) *ListModelCustomizationJobsInput { +func (s *ListProvisionedModelThroughputsInput) SetCreationTimeBefore(v time.Time) *ListProvisionedModelThroughputsInput { s.CreationTimeBefore = &v return s } // SetMaxResults sets the MaxResults field's value. -func (s *ListModelCustomizationJobsInput) SetMaxResults(v int64) *ListModelCustomizationJobsInput { +func (s *ListProvisionedModelThroughputsInput) SetMaxResults(v int64) *ListProvisionedModelThroughputsInput { s.MaxResults = &v return s } +// SetModelArnEquals sets the ModelArnEquals field's value. +func (s *ListProvisionedModelThroughputsInput) SetModelArnEquals(v string) *ListProvisionedModelThroughputsInput { + s.ModelArnEquals = &v + return s +} + // SetNameContains sets the NameContains field's value. -func (s *ListModelCustomizationJobsInput) SetNameContains(v string) *ListModelCustomizationJobsInput { +func (s *ListProvisionedModelThroughputsInput) SetNameContains(v string) *ListProvisionedModelThroughputsInput { s.NameContains = &v return s } // SetNextToken sets the NextToken field's value. -func (s *ListModelCustomizationJobsInput) SetNextToken(v string) *ListModelCustomizationJobsInput { +func (s *ListProvisionedModelThroughputsInput) SetNextToken(v string) *ListProvisionedModelThroughputsInput { s.NextToken = &v return s } // SetSortBy sets the SortBy field's value. -func (s *ListModelCustomizationJobsInput) SetSortBy(v string) *ListModelCustomizationJobsInput { +func (s *ListProvisionedModelThroughputsInput) SetSortBy(v string) *ListProvisionedModelThroughputsInput { s.SortBy = &v return s } // SetSortOrder sets the SortOrder field's value. -func (s *ListModelCustomizationJobsInput) SetSortOrder(v string) *ListModelCustomizationJobsInput { +func (s *ListProvisionedModelThroughputsInput) SetSortOrder(v string) *ListProvisionedModelThroughputsInput { s.SortOrder = &v return s } // SetStatusEquals sets the StatusEquals field's value. -func (s *ListModelCustomizationJobsInput) SetStatusEquals(v string) *ListModelCustomizationJobsInput { +func (s *ListProvisionedModelThroughputsInput) SetStatusEquals(v string) *ListProvisionedModelThroughputsInput { s.StatusEquals = &v return s } -type ListModelCustomizationJobsOutput struct { +type ListProvisionedModelThroughputsOutput struct { _ struct{} `type:"structure"` - // Job summaries. - ModelCustomizationJobSummaries []*ModelCustomizationJobSummary `locationName:"modelCustomizationJobSummaries" type:"list"` - - // Page continuation token to use in the next request. + // Continuation token for the next request to list the next set of results. NextToken *string `locationName:"nextToken" min:"1" type:"string"` + + // List of summaries, one for each provisioned throughput in the response. + ProvisionedModelSummaries []*ProvisionedModelSummary `locationName:"provisionedModelSummaries" type:"list"` } // String returns the string representation. @@ -3493,7 +4636,7 @@ type ListModelCustomizationJobsOutput struct { // API parameter values that are decorated as "sensitive" in the API will not // be included in the string output. The member name will be present, but the // value will be replaced with "sensitive". -func (s ListModelCustomizationJobsOutput) String() string { +func (s ListProvisionedModelThroughputsOutput) String() string { return awsutil.Prettify(s) } @@ -3502,19 +4645,19 @@ func (s ListModelCustomizationJobsOutput) String() string { // API parameter values that are decorated as "sensitive" in the API will not // be included in the string output. The member name will be present, but the // value will be replaced with "sensitive". -func (s ListModelCustomizationJobsOutput) GoString() string { +func (s ListProvisionedModelThroughputsOutput) GoString() string { return s.String() } -// SetModelCustomizationJobSummaries sets the ModelCustomizationJobSummaries field's value. -func (s *ListModelCustomizationJobsOutput) SetModelCustomizationJobSummaries(v []*ModelCustomizationJobSummary) *ListModelCustomizationJobsOutput { - s.ModelCustomizationJobSummaries = v +// SetNextToken sets the NextToken field's value. +func (s *ListProvisionedModelThroughputsOutput) SetNextToken(v string) *ListProvisionedModelThroughputsOutput { + s.NextToken = &v return s } -// SetNextToken sets the NextToken field's value. -func (s *ListModelCustomizationJobsOutput) SetNextToken(v string) *ListModelCustomizationJobsOutput { - s.NextToken = &v +// SetProvisionedModelSummaries sets the ProvisionedModelSummaries field's value. +func (s *ListProvisionedModelThroughputsOutput) SetProvisionedModelSummaries(v []*ProvisionedModelSummary) *ListProvisionedModelThroughputsOutput { + s.ProvisionedModelSummaries = v return s } @@ -3850,6 +4993,157 @@ func (s *OutputDataConfig) SetS3Uri(v string) *OutputDataConfig { return s } +// Set of fields associated with a provisioned throughput. +type ProvisionedModelSummary struct { + _ struct{} `type:"structure"` + + // Commitment duration for the provisioned throughput. + CommitmentDuration *string `locationName:"commitmentDuration" type:"string" enum:"CommitmentDuration"` + + // Commitment expiration time for the provisioned throughput. + CommitmentExpirationTime *time.Time `locationName:"commitmentExpirationTime" type:"timestamp" timestampFormat:"iso8601"` + + // The time that this provisioned throughput was created. + // + // CreationTime is a required field + CreationTime *time.Time `locationName:"creationTime" type:"timestamp" timestampFormat:"iso8601" required:"true"` + + // Desired model ARN. + // + // DesiredModelArn is a required field + DesiredModelArn *string `locationName:"desiredModelArn" min:"20" type:"string" required:"true"` + + // Desired model units. + // + // DesiredModelUnits is a required field + DesiredModelUnits *int64 `locationName:"desiredModelUnits" min:"1" type:"integer" required:"true"` + + // Foundation model ARN. + // + // FoundationModelArn is a required field + FoundationModelArn *string `locationName:"foundationModelArn" type:"string" required:"true"` + + // The time that this provisioned throughput was last modified. + // + // LastModifiedTime is a required field + LastModifiedTime *time.Time `locationName:"lastModifiedTime" type:"timestamp" timestampFormat:"iso8601" required:"true"` + + // The ARN of the model associated with this provisioned throughput. + // + // ModelArn is a required field + ModelArn *string `locationName:"modelArn" min:"20" type:"string" required:"true"` + + // The number of model units allocated. + // + // ModelUnits is a required field + ModelUnits *int64 `locationName:"modelUnits" min:"1" type:"integer" required:"true"` + + // The ARN of the provisioned throughput. + // + // ProvisionedModelArn is a required field + ProvisionedModelArn *string `locationName:"provisionedModelArn" type:"string" required:"true"` + + // The name of the provisioned throughput. + // + // ProvisionedModelName is a required field + ProvisionedModelName *string `locationName:"provisionedModelName" min:"1" type:"string" required:"true"` + + // Status of the provisioned throughput. + // + // Status is a required field + Status *string `locationName:"status" type:"string" required:"true" enum:"ProvisionedModelStatus"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ProvisionedModelSummary) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ProvisionedModelSummary) GoString() string { + return s.String() +} + +// SetCommitmentDuration sets the CommitmentDuration field's value. +func (s *ProvisionedModelSummary) SetCommitmentDuration(v string) *ProvisionedModelSummary { + s.CommitmentDuration = &v + return s +} + +// SetCommitmentExpirationTime sets the CommitmentExpirationTime field's value. +func (s *ProvisionedModelSummary) SetCommitmentExpirationTime(v time.Time) *ProvisionedModelSummary { + s.CommitmentExpirationTime = &v + return s +} + +// SetCreationTime sets the CreationTime field's value. +func (s *ProvisionedModelSummary) SetCreationTime(v time.Time) *ProvisionedModelSummary { + s.CreationTime = &v + return s +} + +// SetDesiredModelArn sets the DesiredModelArn field's value. +func (s *ProvisionedModelSummary) SetDesiredModelArn(v string) *ProvisionedModelSummary { + s.DesiredModelArn = &v + return s +} + +// SetDesiredModelUnits sets the DesiredModelUnits field's value. +func (s *ProvisionedModelSummary) SetDesiredModelUnits(v int64) *ProvisionedModelSummary { + s.DesiredModelUnits = &v + return s +} + +// SetFoundationModelArn sets the FoundationModelArn field's value. +func (s *ProvisionedModelSummary) SetFoundationModelArn(v string) *ProvisionedModelSummary { + s.FoundationModelArn = &v + return s +} + +// SetLastModifiedTime sets the LastModifiedTime field's value. +func (s *ProvisionedModelSummary) SetLastModifiedTime(v time.Time) *ProvisionedModelSummary { + s.LastModifiedTime = &v + return s +} + +// SetModelArn sets the ModelArn field's value. +func (s *ProvisionedModelSummary) SetModelArn(v string) *ProvisionedModelSummary { + s.ModelArn = &v + return s +} + +// SetModelUnits sets the ModelUnits field's value. +func (s *ProvisionedModelSummary) SetModelUnits(v int64) *ProvisionedModelSummary { + s.ModelUnits = &v + return s +} + +// SetProvisionedModelArn sets the ProvisionedModelArn field's value. +func (s *ProvisionedModelSummary) SetProvisionedModelArn(v string) *ProvisionedModelSummary { + s.ProvisionedModelArn = &v + return s +} + +// SetProvisionedModelName sets the ProvisionedModelName field's value. +func (s *ProvisionedModelSummary) SetProvisionedModelName(v string) *ProvisionedModelSummary { + s.ProvisionedModelName = &v + return s +} + +// SetStatus sets the Status field's value. +func (s *ProvisionedModelSummary) SetStatus(v string) *ProvisionedModelSummary { + s.Status = &v + return s +} + type PutModelInvocationLoggingConfigurationInput struct { _ struct{} `type:"structure"` @@ -4641,6 +5935,101 @@ func (s UntagResourceOutput) GoString() string { return s.String() } +type UpdateProvisionedModelThroughputInput struct { + _ struct{} `type:"structure"` + + // The ARN of the new model to associate with this provisioned throughput. + DesiredModelId *string `locationName:"desiredModelId" min:"1" type:"string"` + + // The new name for this provisioned throughput. + DesiredProvisionedModelName *string `locationName:"desiredProvisionedModelName" min:"1" type:"string"` + + // The ARN or name of the provisioned throughput to update. + // + // ProvisionedModelId is a required field + ProvisionedModelId *string `location:"uri" locationName:"provisionedModelId" type:"string" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s UpdateProvisionedModelThroughputInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s UpdateProvisionedModelThroughputInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *UpdateProvisionedModelThroughputInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UpdateProvisionedModelThroughputInput"} + if s.DesiredModelId != nil && len(*s.DesiredModelId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("DesiredModelId", 1)) + } + if s.DesiredProvisionedModelName != nil && len(*s.DesiredProvisionedModelName) < 1 { + invalidParams.Add(request.NewErrParamMinLen("DesiredProvisionedModelName", 1)) + } + if s.ProvisionedModelId == nil { + invalidParams.Add(request.NewErrParamRequired("ProvisionedModelId")) + } + if s.ProvisionedModelId != nil && len(*s.ProvisionedModelId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ProvisionedModelId", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDesiredModelId sets the DesiredModelId field's value. +func (s *UpdateProvisionedModelThroughputInput) SetDesiredModelId(v string) *UpdateProvisionedModelThroughputInput { + s.DesiredModelId = &v + return s +} + +// SetDesiredProvisionedModelName sets the DesiredProvisionedModelName field's value. +func (s *UpdateProvisionedModelThroughputInput) SetDesiredProvisionedModelName(v string) *UpdateProvisionedModelThroughputInput { + s.DesiredProvisionedModelName = &v + return s +} + +// SetProvisionedModelId sets the ProvisionedModelId field's value. +func (s *UpdateProvisionedModelThroughputInput) SetProvisionedModelId(v string) *UpdateProvisionedModelThroughputInput { + s.ProvisionedModelId = &v + return s +} + +type UpdateProvisionedModelThroughputOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s UpdateProvisionedModelThroughputOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s UpdateProvisionedModelThroughputOutput) GoString() string { + return s.String() +} + // Array of up to 10 validators. type ValidationDataConfig struct { _ struct{} `type:"structure"` @@ -4911,6 +6300,22 @@ func (s *VpcConfig) SetSubnetIds(v []*string) *VpcConfig { return s } +const ( + // CommitmentDurationOneMonth is a CommitmentDuration enum value + CommitmentDurationOneMonth = "OneMonth" + + // CommitmentDurationSixMonths is a CommitmentDuration enum value + CommitmentDurationSixMonths = "SixMonths" +) + +// CommitmentDuration_Values returns all elements of the CommitmentDuration enum +func CommitmentDuration_Values() []string { + return []string{ + CommitmentDurationOneMonth, + CommitmentDurationSixMonths, + } +} + const ( // FineTuningJobStatusInProgress is a FineTuningJobStatus enum value FineTuningJobStatusInProgress = "InProgress" @@ -5015,6 +6420,42 @@ func ModelModality_Values() []string { } } +const ( + // ProvisionedModelStatusCreating is a ProvisionedModelStatus enum value + ProvisionedModelStatusCreating = "Creating" + + // ProvisionedModelStatusInService is a ProvisionedModelStatus enum value + ProvisionedModelStatusInService = "InService" + + // ProvisionedModelStatusUpdating is a ProvisionedModelStatus enum value + ProvisionedModelStatusUpdating = "Updating" + + // ProvisionedModelStatusFailed is a ProvisionedModelStatus enum value + ProvisionedModelStatusFailed = "Failed" +) + +// ProvisionedModelStatus_Values returns all elements of the ProvisionedModelStatus enum +func ProvisionedModelStatus_Values() []string { + return []string{ + ProvisionedModelStatusCreating, + ProvisionedModelStatusInService, + ProvisionedModelStatusUpdating, + ProvisionedModelStatusFailed, + } +} + +const ( + // SortByProvisionedModelsCreationTime is a SortByProvisionedModels enum value + SortByProvisionedModelsCreationTime = "CreationTime" +) + +// SortByProvisionedModels_Values returns all elements of the SortByProvisionedModels enum +func SortByProvisionedModels_Values() []string { + return []string{ + SortByProvisionedModelsCreationTime, + } +} + const ( // SortJobsByCreationTime is a SortJobsBy enum value SortJobsByCreationTime = "CreationTime" diff --git a/service/bedrock/bedrockiface/interface.go b/service/bedrock/bedrockiface/interface.go index d9566b13e21..48e502a0848 100644 --- a/service/bedrock/bedrockiface/interface.go +++ b/service/bedrock/bedrockiface/interface.go @@ -64,6 +64,10 @@ type BedrockAPI interface { CreateModelCustomizationJobWithContext(aws.Context, *bedrock.CreateModelCustomizationJobInput, ...request.Option) (*bedrock.CreateModelCustomizationJobOutput, error) CreateModelCustomizationJobRequest(*bedrock.CreateModelCustomizationJobInput) (*request.Request, *bedrock.CreateModelCustomizationJobOutput) + CreateProvisionedModelThroughput(*bedrock.CreateProvisionedModelThroughputInput) (*bedrock.CreateProvisionedModelThroughputOutput, error) + CreateProvisionedModelThroughputWithContext(aws.Context, *bedrock.CreateProvisionedModelThroughputInput, ...request.Option) (*bedrock.CreateProvisionedModelThroughputOutput, error) + CreateProvisionedModelThroughputRequest(*bedrock.CreateProvisionedModelThroughputInput) (*request.Request, *bedrock.CreateProvisionedModelThroughputOutput) + DeleteCustomModel(*bedrock.DeleteCustomModelInput) (*bedrock.DeleteCustomModelOutput, error) DeleteCustomModelWithContext(aws.Context, *bedrock.DeleteCustomModelInput, ...request.Option) (*bedrock.DeleteCustomModelOutput, error) DeleteCustomModelRequest(*bedrock.DeleteCustomModelInput) (*request.Request, *bedrock.DeleteCustomModelOutput) @@ -72,6 +76,10 @@ type BedrockAPI interface { DeleteModelInvocationLoggingConfigurationWithContext(aws.Context, *bedrock.DeleteModelInvocationLoggingConfigurationInput, ...request.Option) (*bedrock.DeleteModelInvocationLoggingConfigurationOutput, error) DeleteModelInvocationLoggingConfigurationRequest(*bedrock.DeleteModelInvocationLoggingConfigurationInput) (*request.Request, *bedrock.DeleteModelInvocationLoggingConfigurationOutput) + DeleteProvisionedModelThroughput(*bedrock.DeleteProvisionedModelThroughputInput) (*bedrock.DeleteProvisionedModelThroughputOutput, error) + DeleteProvisionedModelThroughputWithContext(aws.Context, *bedrock.DeleteProvisionedModelThroughputInput, ...request.Option) (*bedrock.DeleteProvisionedModelThroughputOutput, error) + DeleteProvisionedModelThroughputRequest(*bedrock.DeleteProvisionedModelThroughputInput) (*request.Request, *bedrock.DeleteProvisionedModelThroughputOutput) + GetCustomModel(*bedrock.GetCustomModelInput) (*bedrock.GetCustomModelOutput, error) GetCustomModelWithContext(aws.Context, *bedrock.GetCustomModelInput, ...request.Option) (*bedrock.GetCustomModelOutput, error) GetCustomModelRequest(*bedrock.GetCustomModelInput) (*request.Request, *bedrock.GetCustomModelOutput) @@ -88,6 +96,10 @@ type BedrockAPI interface { GetModelInvocationLoggingConfigurationWithContext(aws.Context, *bedrock.GetModelInvocationLoggingConfigurationInput, ...request.Option) (*bedrock.GetModelInvocationLoggingConfigurationOutput, error) GetModelInvocationLoggingConfigurationRequest(*bedrock.GetModelInvocationLoggingConfigurationInput) (*request.Request, *bedrock.GetModelInvocationLoggingConfigurationOutput) + GetProvisionedModelThroughput(*bedrock.GetProvisionedModelThroughputInput) (*bedrock.GetProvisionedModelThroughputOutput, error) + GetProvisionedModelThroughputWithContext(aws.Context, *bedrock.GetProvisionedModelThroughputInput, ...request.Option) (*bedrock.GetProvisionedModelThroughputOutput, error) + GetProvisionedModelThroughputRequest(*bedrock.GetProvisionedModelThroughputInput) (*request.Request, *bedrock.GetProvisionedModelThroughputOutput) + ListCustomModels(*bedrock.ListCustomModelsInput) (*bedrock.ListCustomModelsOutput, error) ListCustomModelsWithContext(aws.Context, *bedrock.ListCustomModelsInput, ...request.Option) (*bedrock.ListCustomModelsOutput, error) ListCustomModelsRequest(*bedrock.ListCustomModelsInput) (*request.Request, *bedrock.ListCustomModelsOutput) @@ -106,6 +118,13 @@ type BedrockAPI interface { ListModelCustomizationJobsPages(*bedrock.ListModelCustomizationJobsInput, func(*bedrock.ListModelCustomizationJobsOutput, bool) bool) error ListModelCustomizationJobsPagesWithContext(aws.Context, *bedrock.ListModelCustomizationJobsInput, func(*bedrock.ListModelCustomizationJobsOutput, bool) bool, ...request.Option) error + ListProvisionedModelThroughputs(*bedrock.ListProvisionedModelThroughputsInput) (*bedrock.ListProvisionedModelThroughputsOutput, error) + ListProvisionedModelThroughputsWithContext(aws.Context, *bedrock.ListProvisionedModelThroughputsInput, ...request.Option) (*bedrock.ListProvisionedModelThroughputsOutput, error) + ListProvisionedModelThroughputsRequest(*bedrock.ListProvisionedModelThroughputsInput) (*request.Request, *bedrock.ListProvisionedModelThroughputsOutput) + + ListProvisionedModelThroughputsPages(*bedrock.ListProvisionedModelThroughputsInput, func(*bedrock.ListProvisionedModelThroughputsOutput, bool) bool) error + ListProvisionedModelThroughputsPagesWithContext(aws.Context, *bedrock.ListProvisionedModelThroughputsInput, func(*bedrock.ListProvisionedModelThroughputsOutput, bool) bool, ...request.Option) error + ListTagsForResource(*bedrock.ListTagsForResourceInput) (*bedrock.ListTagsForResourceOutput, error) ListTagsForResourceWithContext(aws.Context, *bedrock.ListTagsForResourceInput, ...request.Option) (*bedrock.ListTagsForResourceOutput, error) ListTagsForResourceRequest(*bedrock.ListTagsForResourceInput) (*request.Request, *bedrock.ListTagsForResourceOutput) @@ -125,6 +144,10 @@ type BedrockAPI interface { UntagResource(*bedrock.UntagResourceInput) (*bedrock.UntagResourceOutput, error) UntagResourceWithContext(aws.Context, *bedrock.UntagResourceInput, ...request.Option) (*bedrock.UntagResourceOutput, error) UntagResourceRequest(*bedrock.UntagResourceInput) (*request.Request, *bedrock.UntagResourceOutput) + + UpdateProvisionedModelThroughput(*bedrock.UpdateProvisionedModelThroughputInput) (*bedrock.UpdateProvisionedModelThroughputOutput, error) + UpdateProvisionedModelThroughputWithContext(aws.Context, *bedrock.UpdateProvisionedModelThroughputInput, ...request.Option) (*bedrock.UpdateProvisionedModelThroughputOutput, error) + UpdateProvisionedModelThroughputRequest(*bedrock.UpdateProvisionedModelThroughputInput) (*request.Request, *bedrock.UpdateProvisionedModelThroughputOutput) } var _ BedrockAPI = (*bedrock.Bedrock)(nil) diff --git a/service/bedrockruntime/api.go b/service/bedrockruntime/api.go index 0c9138374d7..9fe3f69aa55 100644 --- a/service/bedrockruntime/api.go +++ b/service/bedrockruntime/api.go @@ -68,8 +68,8 @@ func (c *BedrockRuntime) InvokeModelRequest(input *InvokeModelInput) (req *reque // in the request body. You use InvokeModel to run inference for text models, // image models, and embedding models. // -// For more information about invoking models, see Using the API in the Bedrock -// User Guide (https://d2eo22ngex1n9g.cloudfront.net/Documentation/BedrockUserGuide.pdf). +// For more information, see Run inference (https://docs.aws.amazon.com/bedrock/latest/userguide/api-methods-run.html) +// in the Bedrock User Guide. // // For example requests, see Examples (after the Errors section). // @@ -187,8 +187,8 @@ func (c *BedrockRuntime) InvokeModelWithResponseStreamRequest(input *InvokeModel // Invoke the specified Bedrock model to run inference using the input provided. // Return the response in a stream. // -// For more information about invoking models, see Using the API in the Bedrock -// User Guide (https://d2eo22ngex1n9g.cloudfront.net/Documentation/BedrockUserGuide.pdf). +// For more information, see Run inference (https://docs.aws.amazon.com/bedrock/latest/userguide/api-methods-run.html) +// in the Bedrock User Guide. // // For an example request and response, see Examples (after the Errors section). // @@ -1086,6 +1086,35 @@ func (s ModelTimeoutException) GoString() string { return s.String() } +// The ModelTimeoutException is and event in the ResponseStream group of events. +func (s *ModelTimeoutException) eventResponseStream() {} + +// UnmarshalEvent unmarshals the EventStream Message into the ModelTimeoutException value. +// This method is only used internally within the SDK's EventStream handling. +func (s *ModelTimeoutException) UnmarshalEvent( + payloadUnmarshaler protocol.PayloadUnmarshaler, + msg eventstream.Message, +) error { + if err := payloadUnmarshaler.UnmarshalPayload( + bytes.NewReader(msg.Payload), s, + ); err != nil { + return err + } + return nil +} + +// MarshalEvent marshals the type into an stream event value. This method +// should only used internally within the SDK's EventStream handling. +func (s *ModelTimeoutException) MarshalEvent(pm protocol.PayloadMarshaler) (msg eventstream.Message, err error) { + msg.Headers.Set(eventstreamapi.MessageTypeHeader, eventstream.StringValue(eventstreamapi.ExceptionMessageType)) + var buf bytes.Buffer + if err = pm.MarshalPayload(&buf, s); err != nil { + return eventstream.Message{}, err + } + msg.Payload = buf.Bytes() + return msg, err +} + func newErrorModelTimeoutException(v protocol.ResponseMetadata) error { return &ModelTimeoutException{ RespMetadata: v, @@ -1378,6 +1407,8 @@ func (u unmarshalerForResponseStreamEvent) UnmarshalerForEventName(eventType str return newErrorInternalServerException(u.metadata).(eventstreamapi.Unmarshaler), nil case "modelStreamErrorException": return newErrorModelStreamErrorException(u.metadata).(eventstreamapi.Unmarshaler), nil + case "modelTimeoutException": + return newErrorModelTimeoutException(u.metadata).(eventstreamapi.Unmarshaler), nil case "throttlingException": return newErrorThrottlingException(u.metadata).(eventstreamapi.Unmarshaler), nil case "validationException": diff --git a/service/bedrockruntime/eventstream_test.go b/service/bedrockruntime/eventstream_test.go index 51e5a8d2310..dadf4b5da2f 100644 --- a/service/bedrockruntime/eventstream_test.go +++ b/service/bedrockruntime/eventstream_test.go @@ -330,6 +330,7 @@ func TestInvokeModelWithResponseStream_ReadException(t *testing.T) { var _ awserr.Error = (*InternalServerException)(nil) var _ awserr.Error = (*ModelStreamErrorException)(nil) +var _ awserr.Error = (*ModelTimeoutException)(nil) var _ awserr.Error = (*ThrottlingException)(nil) var _ awserr.Error = (*ValidationException)(nil) diff --git a/service/ec2/api.go b/service/ec2/api.go index b9580698f26..364bd4320ba 100644 --- a/service/ec2/api.go +++ b/service/ec2/api.go @@ -188129,6 +188129,30 @@ const ( // InstanceTypeMac2M2proMetal is a InstanceType enum value InstanceTypeMac2M2proMetal = "mac2-m2pro.metal" + + // InstanceTypeR7izLarge is a InstanceType enum value + InstanceTypeR7izLarge = "r7iz.large" + + // InstanceTypeR7izXlarge is a InstanceType enum value + InstanceTypeR7izXlarge = "r7iz.xlarge" + + // InstanceTypeR7iz2xlarge is a InstanceType enum value + InstanceTypeR7iz2xlarge = "r7iz.2xlarge" + + // InstanceTypeR7iz4xlarge is a InstanceType enum value + InstanceTypeR7iz4xlarge = "r7iz.4xlarge" + + // InstanceTypeR7iz8xlarge is a InstanceType enum value + InstanceTypeR7iz8xlarge = "r7iz.8xlarge" + + // InstanceTypeR7iz12xlarge is a InstanceType enum value + InstanceTypeR7iz12xlarge = "r7iz.12xlarge" + + // InstanceTypeR7iz16xlarge is a InstanceType enum value + InstanceTypeR7iz16xlarge = "r7iz.16xlarge" + + // InstanceTypeR7iz32xlarge is a InstanceType enum value + InstanceTypeR7iz32xlarge = "r7iz.32xlarge" ) // InstanceType_Values returns all elements of the InstanceType enum @@ -188875,6 +188899,14 @@ func InstanceType_Values() []string { InstanceTypeC7i24xlarge, InstanceTypeC7i48xlarge, InstanceTypeMac2M2proMetal, + InstanceTypeR7izLarge, + InstanceTypeR7izXlarge, + InstanceTypeR7iz2xlarge, + InstanceTypeR7iz4xlarge, + InstanceTypeR7iz8xlarge, + InstanceTypeR7iz12xlarge, + InstanceTypeR7iz16xlarge, + InstanceTypeR7iz32xlarge, } } diff --git a/service/managedblockchain/api.go b/service/managedblockchain/api.go index bb4ad7ca8a2..7dd92c0d094 100644 --- a/service/managedblockchain/api.go +++ b/service/managedblockchain/api.go @@ -3967,8 +3967,6 @@ type CreateNodeInput struct { // // * n-ethereum-goerli // - // * n-ethereum-rinkeby - // // NetworkId is a required field NetworkId *string `location:"uri" locationName:"networkId" min:"1" type:"string" required:"true"` @@ -4438,8 +4436,6 @@ type DeleteNodeInput struct { // // * n-ethereum-goerli // - // * n-ethereum-rinkeby - // // NetworkId is a required field NetworkId *string `location:"uri" locationName:"networkId" min:"1" type:"string" required:"true"` @@ -7156,8 +7152,6 @@ type NetworkEthereumAttributes struct { // * mainnet = 1 // // * goerli = 5 - // - // * rinkeby = 4 ChainId *string `type:"string"` } diff --git a/service/rds/api.go b/service/rds/api.go index 30cb14c65c9..32179862406 100644 --- a/service/rds/api.go +++ b/service/rds/api.go @@ -5147,8 +5147,8 @@ func (c *RDS) DescribeCertificatesRequest(input *DescribeCertificatesInput) (req // DescribeCertificates API operation for Amazon Relational Database Service. // -// Lists the set of CA certificates provided by Amazon RDS for this Amazon Web -// Services account. +// Lists the set of certificate authority (CA) certificates provided by Amazon +// RDS for this Amazon Web Services account. // // For more information, see Using SSL/TLS to encrypt a connection to a DB instance // (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/UsingWithRDS.SSL.html) @@ -32574,6 +32574,12 @@ type DescribeCertificatesOutput struct { // The list of Certificate objects for the Amazon Web Services account. Certificates []*Certificate `locationNameList:"Certificate" type:"list"` + // The default root CA for new databases created by your Amazon Web Services + // account. This is either the root CA override set on your Amazon Web Services + // account or the system default CA for the Region if no override exists. To + // override the default CA, use the ModifyCertificates operation. + DefaultCertificateForNewLaunches *string `type:"string"` + // An optional pagination token provided by a previous DescribeCertificates // request. If this parameter is specified, the response includes only records // beyond the marker, up to the value specified by MaxRecords . @@ -32604,6 +32610,12 @@ func (s *DescribeCertificatesOutput) SetCertificates(v []*Certificate) *Describe return s } +// SetDefaultCertificateForNewLaunches sets the DefaultCertificateForNewLaunches field's value. +func (s *DescribeCertificatesOutput) SetDefaultCertificateForNewLaunches(v string) *DescribeCertificatesOutput { + s.DefaultCertificateForNewLaunches = &v + return s +} + // SetMarker sets the Marker field's value. func (s *DescribeCertificatesOutput) SetMarker(v string) *DescribeCertificatesOutput { s.Marker = &v @@ -41335,7 +41347,7 @@ type ModifyDBClusterInput struct { // Specifies whether major version upgrades are allowed. // - // Valid for Cluster Type: Aurora DB clusters only + // Valid for Cluster Type: Aurora DB clusters and Multi-AZ DB clusters // // Constraints: // @@ -42585,6 +42597,14 @@ type ModifyDBInstanceInput struct { // ApplyImmediately in your request. // // Default: Uses existing setting + // + // Constraints: + // + // * If you are modifying the DB instance class and upgrading the engine + // version at the same time, the currently running engine version must be + // supported on the specified DB instance class. Otherwise, the operation + // returns an error. In this case, first run the operation to modify the + // DB instance class, and then run it again to upgrade the engine version. DBInstanceClass *string `type:"string"` // The identifier of DB instance to modify. This value is stored as a lowercase @@ -42824,6 +42844,14 @@ type ModifyDBInstanceInput struct { // // In RDS Custom for Oracle, this parameter is supported for read replicas only // if they are in the PATCH_DB_FAILURE lifecycle. + // + // Constraints: + // + // * If you are upgrading the engine version and modifying the DB instance + // class at the same time, the currently running engine version must be supported + // on the specified DB instance class. Otherwise, the operation returns an + // error. In this case, first run the operation to modify the DB instance + // class, and then run it again to upgrade the engine version. EngineVersion *string `type:"string"` // The new Provisioned IOPS (I/O operations per second) value for the RDS instance. @@ -49666,9 +49694,11 @@ type RestoreDBClusterToPointInTimeInput struct { // Valid for: Multi-AZ DB clusters only DBClusterInstanceClass *string `type:"string"` - // The name of the DB cluster parameter group to associate with this DB cluster. - // If this argument is omitted, the default DB cluster parameter group for the - // specified engine is used. + // The name of the custom DB cluster parameter group to associate with this + // DB cluster. + // + // If the DBClusterParameterGroupName parameter is omitted, the default DB cluster + // parameter group for the specified engine is used. // // Constraints: // @@ -51751,8 +51781,8 @@ type RestoreDBInstanceToPointInTimeInput struct { // growth. AllocatedStorage *int64 `type:"integer"` - // A value that indicates whether minor version upgrades are applied automatically - // to the DB instance during the maintenance window. + // Specifies whether minor version upgrades are applied automatically to the + // DB instance during the maintenance window. // // This setting doesn't apply to RDS Custom. AutoMinorVersionUpgrade *bool `type:"boolean"` @@ -51761,8 +51791,10 @@ type RestoreDBInstanceToPointInTimeInput struct { // // Default: A random, system-chosen Availability Zone. // - // Constraint: You can't specify the AvailabilityZone parameter if the DB instance - // is a Multi-AZ deployment. + // Constraints: + // + // * You can't specify the AvailabilityZone parameter if the DB instance + // is a Multi-AZ deployment. // // Example: us-east-1a AvailabilityZone *string `type:"string"` @@ -51778,8 +51810,8 @@ type RestoreDBInstanceToPointInTimeInput struct { // in the Amazon RDS User Guide. BackupTarget *string `type:"string"` - // A value that indicates whether to copy all tags from the restored DB instance - // to snapshots of the DB instance. By default, tags are not copied. + // Specifies whether to copy all tags from the restored DB instance to snapshots + // of the DB instance. By default, tags are not copied. CopyTagsToSnapshot *bool `type:"boolean"` // The instance profile associated with the underlying Amazon EC2 instance of @@ -51806,7 +51838,7 @@ type RestoreDBInstanceToPointInTimeInput struct { // classes, and availability for your engine, see DB Instance Class (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.DBInstanceClass.html) // in the Amazon RDS User Guide. // - // Default: The same DBInstanceClass as the original DB instance. + // Default: The same DB instance class as the original DB instance. DBInstanceClass *string `type:"string"` // The database name for the restored DB instance. @@ -51824,7 +51856,7 @@ type RestoreDBInstanceToPointInTimeInput struct { // // Constraints: // - // * If supplied, must match the name of an existing DBParameterGroup. + // * If supplied, must match the name of an existing DB parameter group. // // * Must be 1 to 255 letters, numbers, or hyphens. // @@ -51835,21 +51867,23 @@ type RestoreDBInstanceToPointInTimeInput struct { // The DB subnet group name to use for the new instance. // - // Constraints: If supplied, must match the name of an existing DBSubnetGroup. + // Constraints: + // + // * If supplied, must match the name of an existing DB subnet group. // // Example: mydbsubnetgroup DBSubnetGroupName *string `type:"string"` - // A value that indicates whether the DB instance has deletion protection enabled. - // The database can't be deleted when deletion protection is enabled. By default, - // deletion protection isn't enabled. For more information, see Deleting a DB - // Instance (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_DeleteInstance.html). + // Specifies whether the DB instance has deletion protection enabled. The database + // can't be deleted when deletion protection is enabled. By default, deletion + // protection isn't enabled. For more information, see Deleting a DB Instance + // (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_DeleteInstance.html). DeletionProtection *bool `type:"boolean"` - // Specify the Active Directory directory ID to restore the DB instance in. - // Create the domain before running this command. Currently, you can create - // only the MySQL, Microsoft SQL Server, Oracle, and PostgreSQL DB instances - // in an Active Directory Domain. + // The Active Directory directory ID to restore the DB instance in. Create the + // domain before running this command. Currently, you can create only the MySQL, + // Microsoft SQL Server, Oracle, and PostgreSQL DB instances in an Active Directory + // Domain. // // This setting doesn't apply to RDS Custom. // @@ -51912,8 +51946,8 @@ type RestoreDBInstanceToPointInTimeInput struct { // This setting doesn't apply to RDS Custom. EnableCloudwatchLogsExports []*string `type:"list"` - // A value that indicates whether to enable a customer-owned IP address (CoIP) - // for an RDS on Outposts DB instance. + // Specifies whether to enable a customer-owned IP address (CoIP) for an RDS + // on Outposts DB instance. // // A CoIP provides local or external connectivity to resources in your Outpost // subnets through your on-premises network. For some use cases, a CoIP can @@ -51930,9 +51964,9 @@ type RestoreDBInstanceToPointInTimeInput struct { // in the Amazon Web Services Outposts User Guide. EnableCustomerOwnedIp *bool `type:"boolean"` - // A value that indicates whether to enable mapping of Amazon Web Services Identity - // and Access Management (IAM) accounts to database accounts. By default, mapping - // isn't enabled. + // Specifies whether to enable mapping of Amazon Web Services Identity and Access + // Management (IAM) accounts to database accounts. By default, mapping isn't + // enabled. // // This setting doesn't apply to RDS Custom. // @@ -51945,10 +51979,6 @@ type RestoreDBInstanceToPointInTimeInput struct { // // This setting doesn't apply to RDS Custom. // - // Default: The same as source - // - // Constraint: Must be compatible with the engine of the source - // // Valid Values: // // * mariadb @@ -51972,25 +52002,31 @@ type RestoreDBInstanceToPointInTimeInput struct { // * sqlserver-ex // // * sqlserver-web + // + // Default: The same as source + // + // Constraints: + // + // * Must be compatible with the engine of the source. Engine *string `type:"string"` - // The amount of Provisioned IOPS (input/output operations per second) to be - // initially allocated for the DB instance. + // The amount of Provisioned IOPS (input/output operations per second) to initially + // allocate for the DB instance. // - // Constraints: Must be an integer greater than 1000. + // This setting doesn't apply to SQL Server. // - // SQL Server + // Constraints: // - // Setting the IOPS value for the SQL Server database engine isn't supported. + // * Must be an integer greater than 1000. Iops *int64 `type:"integer"` - // License model information for the restored DB instance. + // The license model information for the restored DB instance. // // This setting doesn't apply to RDS Custom. // - // Default: Same as source. + // Valid Values: license-included | bring-your-own-license | general-public-license // - // Valid values: license-included | bring-your-own-license | general-public-license + // Default: Same as the source. LicenseModel *string `type:"string"` // The upper limit in gibibytes (GiB) to which Amazon RDS can automatically @@ -52004,31 +52040,33 @@ type RestoreDBInstanceToPointInTimeInput struct { // This setting doesn't apply to RDS Custom. MaxAllocatedStorage *int64 `type:"integer"` - // A value that indicates whether the DB instance is a Multi-AZ deployment. + // Secifies whether the DB instance is a Multi-AZ deployment. // // This setting doesn't apply to RDS Custom. // - // Constraint: You can't specify the AvailabilityZone parameter if the DB instance - // is a Multi-AZ deployment. + // Constraints: + // + // * You can't specify the AvailabilityZone parameter if the DB instance + // is a Multi-AZ deployment. MultiAZ *bool `type:"boolean"` // The network type of the DB instance. // - // Valid values: - // - // * IPV4 - // - // * DUAL - // // The network type is determined by the DBSubnetGroup specified for the DB // instance. A DBSubnetGroup can support only the IPv4 protocol or the IPv4 // and the IPv6 protocols (DUAL). // // For more information, see Working with a DB instance in a VPC (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.WorkingWithRDSInstanceinaVPC.html) // in the Amazon RDS User Guide. + // + // Valid Values: + // + // * IPV4 + // + // * DUAL NetworkType *string `type:"string"` - // The name of the option group to be used for the restored DB instance. + // The name of the option group to use for the restored DB instance. // // Permanent options, such as the TDE option for Oracle Advanced Security TDE, // can't be removed from an option group, and that option group can't be removed @@ -52039,9 +52077,11 @@ type RestoreDBInstanceToPointInTimeInput struct { // The port number on which the database accepts connections. // - // Constraints: Value must be 1150-65535 - // // Default: The same port as the original DB instance. + // + // Constraints: + // + // * The value must be 1150-65535. Port *int64 `type:"integer"` // The number of CPU cores and the number of threads per core for the DB instance @@ -52050,7 +52090,7 @@ type RestoreDBInstanceToPointInTimeInput struct { // This setting doesn't apply to RDS Custom. ProcessorFeatures []*ProcessorFeature `locationNameList:"ProcessorFeature" type:"list"` - // A value that indicates whether the DB instance is publicly accessible. + // Specifies whether the DB instance is publicly accessible. // // When the DB cluster is publicly accessible, its Domain Name System (DNS) // endpoint resolves to the private IP address from within the DB cluster's @@ -52067,19 +52107,19 @@ type RestoreDBInstanceToPointInTimeInput struct { // The date and time to restore from. // - // Valid Values: Value must be a time in Universal Coordinated Time (UTC) format - // // Constraints: // - // * Must be before the latest restorable time for the DB instance + // * Must be a time in Universal Coordinated Time (UTC) format. // - // * Can't be specified if the UseLatestRestorableTime parameter is enabled + // * Must be before the latest restorable time for the DB instance. + // + // * Can't be specified if the UseLatestRestorableTime parameter is enabled. // // Example: 2009-09-07T23:45:00Z RestoreTime *time.Time `type:"timestamp"` // The Amazon Resource Name (ARN) of the replicated automated backups from which - // to restore, for example, arn:aws:rds:useast-1:123456789012:auto-backup:ab-L2IJCEXJP7XQ7HOJ4SIEXAMPLE. + // to restore, for example, arn:aws:rds:us-east-1:123456789012:auto-backup:ab-L2IJCEXJP7XQ7HOJ4SIEXAMPLE. // // This setting doesn't apply to RDS Custom. SourceDBInstanceAutomatedBackupsArn *string `type:"string"` @@ -52094,33 +52134,36 @@ type RestoreDBInstanceToPointInTimeInput struct { // The resource ID of the source DB instance from which to restore. SourceDbiResourceId *string `type:"string"` - // Specifies the storage throughput value for the DB instance. + // The storage throughput value for the DB instance. // // This setting doesn't apply to RDS Custom or Amazon Aurora. StorageThroughput *int64 `type:"integer"` - // Specifies the storage type to be associated with the DB instance. + // The storage type to associate with the DB instance. // - // Valid values: gp2 | gp3 | io1 | standard + // Valid Values: gp2 | gp3 | io1 | standard // - // If you specify io1 or gp3, you must also include a value for the Iops parameter. + // Default: io1, if the Iops parameter is specified. Otherwise, gp2. // - // Default: io1 if the Iops parameter is specified, otherwise gp2 + // Constraints: + // + // * If you specify io1 or gp3, you must also include a value for the Iops + // parameter. StorageType *string `type:"string"` // A list of tags. For more information, see Tagging Amazon RDS Resources (https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_Tagging.html) // in the Amazon RDS User Guide. Tags []*Tag `locationNameList:"Tag" type:"list"` - // The name of the new DB instance to be created. + // The name of the new DB instance to create. // // Constraints: // - // * Must contain from 1 to 63 letters, numbers, or hyphens + // * Must contain from 1 to 63 letters, numbers, or hyphens. // - // * First character must be a letter + // * First character must be a letter. // - // * Can't end with a hyphen or contain two consecutive hyphens + // * Can't end with a hyphen or contain two consecutive hyphens. // // TargetDBInstanceIdentifier is a required field TargetDBInstanceIdentifier *string `type:"string" required:"true"` @@ -52142,11 +52185,12 @@ type RestoreDBInstanceToPointInTimeInput struct { // This setting doesn't apply to RDS Custom. UseDefaultProcessorFeatures *bool `type:"boolean"` - // A value that indicates whether the DB instance is restored from the latest - // backup time. By default, the DB instance isn't restored from the latest backup - // time. + // Specifies whether the DB instance is restored from the latest backup time. + // By default, the DB instance isn't restored from the latest backup time. + // + // Constraints: // - // Constraints: Can't be specified if the RestoreTime parameter is provided. + // * Can't be specified if the RestoreTime parameter is provided. UseLatestRestorableTime *bool `type:"boolean"` // A list of EC2 VPC security groups to associate with this DB instance. diff --git a/service/transfer/api.go b/service/transfer/api.go index 359c895979b..c012a48f1bc 100644 --- a/service/transfer/api.go +++ b/service/transfer/api.go @@ -77,14 +77,14 @@ func (c *Transfer) CreateAccessRequest(input *CreateAccessInput) (req *request.R // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. // // - ResourceExistsException -// The requested resource does not exist. +// The requested resource does not exist, or exists in a region other than the +// one specified for the command. // // - ResourceNotFoundException // This exception is thrown when a resource is not found by the Amazon Web ServicesTransfer @@ -178,14 +178,14 @@ func (c *Transfer) CreateAgreementRequest(input *CreateAgreementInput) (req *req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. // // - ResourceExistsException -// The requested resource does not exist. +// The requested resource does not exist, or exists in a region other than the +// one specified for the command. // // - ResourceNotFoundException // This exception is thrown when a resource is not found by the Amazon Web ServicesTransfer @@ -283,14 +283,14 @@ func (c *Transfer) CreateConnectorRequest(input *CreateConnectorInput) (req *req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. // // - ResourceExistsException -// The requested resource does not exist. +// The requested resource does not exist, or exists in a region other than the +// one specified for the command. // // - ResourceNotFoundException // This exception is thrown when a resource is not found by the Amazon Web ServicesTransfer @@ -380,8 +380,7 @@ func (c *Transfer) CreateProfileRequest(input *CreateProfileInput) (req *request // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -480,14 +479,14 @@ func (c *Transfer) CreateServerRequest(input *CreateServerInput) (req *request.R // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. // // - ResourceExistsException -// The requested resource does not exist. +// The requested resource does not exist, or exists in a region other than the +// one specified for the command. // // - ResourceNotFoundException // This exception is thrown when a resource is not found by the Amazon Web ServicesTransfer @@ -583,14 +582,14 @@ func (c *Transfer) CreateUserRequest(input *CreateUserInput) (req *request.Reque // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. // // - ResourceExistsException -// The requested resource does not exist. +// The requested resource does not exist, or exists in a region other than the +// one specified for the command. // // - ResourceNotFoundException // This exception is thrown when a resource is not found by the Amazon Web ServicesTransfer @@ -683,14 +682,14 @@ func (c *Transfer) CreateWorkflowRequest(input *CreateWorkflowInput) (req *reque // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. // // - ResourceExistsException -// The requested resource does not exist. +// The requested resource does not exist, or exists in a region other than the +// one specified for the command. // // - ThrottlingException // The request was denied due to request throttling. @@ -778,8 +777,7 @@ func (c *Transfer) DeleteAccessRequest(input *DeleteAccessInput) (req *request.R // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -870,8 +868,7 @@ func (c *Transfer) DeleteAgreementRequest(input *DeleteAgreementInput) (req *req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -962,8 +959,7 @@ func (c *Transfer) DeleteCertificateRequest(input *DeleteCertificateInput) (req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -1054,8 +1050,7 @@ func (c *Transfer) DeleteConnectorRequest(input *DeleteConnectorInput) (req *req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -1146,8 +1141,7 @@ func (c *Transfer) DeleteHostKeyRequest(input *DeleteHostKeyInput) (req *request // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -1241,8 +1235,7 @@ func (c *Transfer) DeleteProfileRequest(input *DeleteProfileInput) (req *request // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -1338,8 +1331,7 @@ func (c *Transfer) DeleteServerRequest(input *DeleteServerInput) (req *request.R // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -1430,8 +1422,7 @@ func (c *Transfer) DeleteSshPublicKeyRequest(input *DeleteSshPublicKeyInput) (re // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -1530,8 +1521,7 @@ func (c *Transfer) DeleteUserRequest(input *DeleteUserInput) (req *request.Reque // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -1625,8 +1615,7 @@ func (c *Transfer) DeleteWorkflowRequest(input *DeleteWorkflowInput) (req *reque // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -1720,8 +1709,7 @@ func (c *Transfer) DescribeAccessRequest(input *DescribeAccessInput) (req *reque // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -1811,8 +1799,7 @@ func (c *Transfer) DescribeAgreementRequest(input *DescribeAgreementInput) (req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -1902,8 +1889,7 @@ func (c *Transfer) DescribeCertificateRequest(input *DescribeCertificateInput) ( // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -1993,8 +1979,7 @@ func (c *Transfer) DescribeConnectorRequest(input *DescribeConnectorInput) (req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -2091,8 +2076,7 @@ func (c *Transfer) DescribeExecutionRequest(input *DescribeExecutionInput) (req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -2183,8 +2167,7 @@ func (c *Transfer) DescribeHostKeyRequest(input *DescribeHostKeyInput) (req *req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -2274,8 +2257,7 @@ func (c *Transfer) DescribeProfileRequest(input *DescribeProfileInput) (req *req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -2368,8 +2350,7 @@ func (c *Transfer) DescribeSecurityPolicyRequest(input *DescribeSecurityPolicyIn // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -2463,8 +2444,7 @@ func (c *Transfer) DescribeServerRequest(input *DescribeServerInput) (req *reque // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -2558,8 +2538,7 @@ func (c *Transfer) DescribeUserRequest(input *DescribeUserInput) (req *request.R // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -2649,8 +2628,7 @@ func (c *Transfer) DescribeWorkflowRequest(input *DescribeWorkflowInput) (req *r // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -2741,8 +2719,7 @@ func (c *Transfer) ImportCertificateRequest(input *ImportCertificateInput) (req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -2832,14 +2809,14 @@ func (c *Transfer) ImportHostKeyRequest(input *ImportHostKeyInput) (req *request // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. // // - ResourceExistsException -// The requested resource does not exist. +// The requested resource does not exist, or exists in a region other than the +// one specified for the command. // // - ResourceNotFoundException // This exception is thrown when a resource is not found by the Amazon Web ServicesTransfer @@ -2934,14 +2911,14 @@ func (c *Transfer) ImportSshPublicKeyRequest(input *ImportSshPublicKeyInput) (re // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. // // - ResourceExistsException -// The requested resource does not exist. +// The requested resource does not exist, or exists in a region other than the +// one specified for the command. // // - ResourceNotFoundException // This exception is thrown when a resource is not found by the Amazon Web ServicesTransfer @@ -3037,8 +3014,7 @@ func (c *Transfer) ListAccessesRequest(input *ListAccessesInput) (req *request.R // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidNextTokenException // The NextToken parameter that was passed is invalid. @@ -3192,8 +3168,7 @@ func (c *Transfer) ListAgreementsRequest(input *ListAgreementsInput) (req *reque // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidNextTokenException // The NextToken parameter that was passed is invalid. @@ -3347,8 +3322,7 @@ func (c *Transfer) ListCertificatesRequest(input *ListCertificatesInput) (req *r // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidNextTokenException // The NextToken parameter that was passed is invalid. @@ -3498,8 +3472,7 @@ func (c *Transfer) ListConnectorsRequest(input *ListConnectorsInput) (req *reque // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidNextTokenException // The NextToken parameter that was passed is invalid. @@ -3652,8 +3625,7 @@ func (c *Transfer) ListExecutionsRequest(input *ListExecutionsInput) (req *reque // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidNextTokenException // The NextToken parameter that was passed is invalid. @@ -3798,8 +3770,7 @@ func (c *Transfer) ListHostKeysRequest(input *ListHostKeysInput) (req *request.R // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidNextTokenException // The NextToken parameter that was passed is invalid. @@ -3901,8 +3872,7 @@ func (c *Transfer) ListProfilesRequest(input *ListProfilesInput) (req *request.R // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidNextTokenException // The NextToken parameter that was passed is invalid. @@ -4053,8 +4023,7 @@ func (c *Transfer) ListSecurityPoliciesRequest(input *ListSecurityPoliciesInput) // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidNextTokenException // The NextToken parameter that was passed is invalid. @@ -4201,8 +4170,7 @@ func (c *Transfer) ListServersRequest(input *ListServersInput) (req *request.Req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidNextTokenException // The NextToken parameter that was passed is invalid. @@ -4349,8 +4317,7 @@ func (c *Transfer) ListTagsForResourceRequest(input *ListTagsForResourceInput) ( // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidNextTokenException // The NextToken parameter that was passed is invalid. @@ -4497,8 +4464,7 @@ func (c *Transfer) ListUsersRequest(input *ListUsersInput) (req *request.Request // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidNextTokenException // The NextToken parameter that was passed is invalid. @@ -4649,8 +4615,7 @@ func (c *Transfer) ListWorkflowsRequest(input *ListWorkflowsInput) (req *request // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidNextTokenException // The NextToken parameter that was passed is invalid. @@ -4798,8 +4763,7 @@ func (c *Transfer) SendWorkflowStepStateRequest(input *SendWorkflowStepStateInpu // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -4907,8 +4871,7 @@ func (c *Transfer) StartFileTransferRequest(input *StartFileTransferInput) (req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -5010,8 +4973,7 @@ func (c *Transfer) StartServerRequest(input *StartServerInput) (req *request.Req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -5117,8 +5079,7 @@ func (c *Transfer) StopServerRequest(input *StopServerInput) (req *request.Reque // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -5215,8 +5176,7 @@ func (c *Transfer) TagResourceRequest(input *TagResourceInput) (req *request.Req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -5292,7 +5252,7 @@ func (c *Transfer) TestConnectionRequest(input *TestConnectionInput) (req *reque // // Tests whether your SFTP connector is set up successfully. We highly recommend // that you call this operation to test your ability to transfer files between -// a Transfer Family server and a trading partner's SFTP server. +// local Amazon Web Services storage and a trading partner's SFTP server. // // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about @@ -5308,8 +5268,7 @@ func (c *Transfer) TestConnectionRequest(input *TestConnectionInput) (req *reque // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -5432,8 +5391,7 @@ func (c *Transfer) TestIdentityProviderRequest(input *TestIdentityProviderInput) // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -5527,8 +5485,7 @@ func (c *Transfer) UntagResourceRequest(input *UntagResourceInput) (req *request // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -5619,14 +5576,14 @@ func (c *Transfer) UpdateAccessRequest(input *UpdateAccessInput) (req *request.R // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. // // - ResourceExistsException -// The requested resource does not exist. +// The requested resource does not exist, or exists in a region other than the +// one specified for the command. // // - ResourceNotFoundException // This exception is thrown when a resource is not found by the Amazon Web ServicesTransfer @@ -5718,14 +5675,14 @@ func (c *Transfer) UpdateAgreementRequest(input *UpdateAgreementInput) (req *req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. // // - ResourceExistsException -// The requested resource does not exist. +// The requested resource does not exist, or exists in a region other than the +// one specified for the command. // // - ResourceNotFoundException // This exception is thrown when a resource is not found by the Amazon Web ServicesTransfer @@ -5815,8 +5772,7 @@ func (c *Transfer) UpdateCertificateRequest(input *UpdateCertificateInput) (req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -5911,14 +5867,14 @@ func (c *Transfer) UpdateConnectorRequest(input *UpdateConnectorInput) (req *req // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. // // - ResourceExistsException -// The requested resource does not exist. +// The requested resource does not exist, or exists in a region other than the +// one specified for the command. // // - ResourceNotFoundException // This exception is thrown when a resource is not found by the Amazon Web ServicesTransfer @@ -6009,8 +5965,7 @@ func (c *Transfer) UpdateHostKeyRequest(input *UpdateHostKeyInput) (req *request // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -6105,8 +6060,7 @@ func (c *Transfer) UpdateProfileRequest(input *UpdateProfileInput) (req *request // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -6210,14 +6164,14 @@ func (c *Transfer) UpdateServerRequest(input *UpdateServerInput) (req *request.R // VpcEndpointID is not in the available state. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. // // - ResourceExistsException -// The requested resource does not exist. +// The requested resource does not exist, or exists in a region other than the +// one specified for the command. // // - ResourceNotFoundException // This exception is thrown when a resource is not found by the Amazon Web ServicesTransfer @@ -6311,8 +6265,7 @@ func (c *Transfer) UpdateUserRequest(input *UpdateUserInput) (req *request.Reque // is not available. // // - InternalServiceError -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. // // - InvalidRequestException // This exception is thrown when the client submits a malformed request. @@ -6773,6 +6726,8 @@ type CreateAccessInput struct { // using the client. // // A HomeDirectory example is /bucket_name/home/mydirectory. + // + // The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL. HomeDirectory *string `type:"string"` // Logical directory mappings that specify what Amazon S3 or Amazon EFS paths @@ -6798,10 +6753,15 @@ type CreateAccessInput struct { // The type of landing directory (folder) that you want your users' home directory // to be when they log in to the server. If you set it to PATH, the user will - // see the absolute Amazon S3 bucket or EFS paths as is in their file transfer - // protocol clients. If you set it LOGICAL, you need to provide mappings in - // the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS - // paths visible to your users. + // see the absolute Amazon S3 bucket or Amazon EFS path as is in their file + // transfer protocol clients. If you set it to LOGICAL, you need to provide + // mappings in the HomeDirectoryMappings for how you want to make Amazon S3 + // or Amazon EFS paths visible to your users. + // + // If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings + // parameter. If, on the other hand, HomeDirectoryType is PATH, you provide + // an absolute path using the HomeDirectory parameter. You cannot have both + // HomeDirectory and HomeDirectoryMappings in your template. HomeDirectoryType *string `type:"string" enum:"HomeDirectoryType"` // A session policy for your user so that you can use the same Identity and @@ -8000,6 +7960,8 @@ type CreateUserInput struct { // using the client. // // A HomeDirectory example is /bucket_name/home/mydirectory. + // + // The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL. HomeDirectory *string `type:"string"` // Logical directory mappings that specify what Amazon S3 or Amazon EFS paths @@ -8026,10 +7988,15 @@ type CreateUserInput struct { // The type of landing directory (folder) that you want your users' home directory // to be when they log in to the server. If you set it to PATH, the user will - // see the absolute Amazon S3 bucket or EFS paths as is in their file transfer - // protocol clients. If you set it LOGICAL, you need to provide mappings in - // the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS - // paths visible to your users. + // see the absolute Amazon S3 bucket or Amazon EFS path as is in their file + // transfer protocol clients. If you set it to LOGICAL, you need to provide + // mappings in the HomeDirectoryMappings for how you want to make Amazon S3 + // or Amazon EFS paths visible to your users. + // + // If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings + // parameter. If, on the other hand, HomeDirectoryType is PATH, you provide + // an absolute path using the HomeDirectory parameter. You cannot have both + // HomeDirectory and HomeDirectoryMappings in your template. HomeDirectoryType *string `type:"string" enum:"HomeDirectoryType"` // A session policy for your user so that you can use the same Identity and @@ -10591,6 +10558,8 @@ type DescribedAccess struct { // using the client. // // A HomeDirectory example is /bucket_name/home/mydirectory. + // + // The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL. HomeDirectory *string `type:"string"` // Logical directory mappings that specify what Amazon S3 or Amazon EFS paths @@ -10609,10 +10578,15 @@ type DescribedAccess struct { // The type of landing directory (folder) that you want your users' home directory // to be when they log in to the server. If you set it to PATH, the user will - // see the absolute Amazon S3 bucket or EFS paths as is in their file transfer - // protocol clients. If you set it LOGICAL, you need to provide mappings in - // the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS - // paths visible to your users. + // see the absolute Amazon S3 bucket or Amazon EFS path as is in their file + // transfer protocol clients. If you set it to LOGICAL, you need to provide + // mappings in the HomeDirectoryMappings for how you want to make Amazon S3 + // or Amazon EFS paths visible to your users. + // + // If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings + // parameter. If, on the other hand, HomeDirectoryType is PATH, you provide + // an absolute path using the HomeDirectory parameter. You cannot have both + // HomeDirectory and HomeDirectoryMappings in your template. HomeDirectoryType *string `type:"string" enum:"HomeDirectoryType"` // A session policy for your user so that you can use the same Identity and @@ -11847,6 +11821,8 @@ type DescribedUser struct { // using the client. // // A HomeDirectory example is /bucket_name/home/mydirectory. + // + // The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL. HomeDirectory *string `type:"string"` // Logical directory mappings that specify what Amazon S3 or Amazon EFS paths @@ -11864,10 +11840,15 @@ type DescribedUser struct { // The type of landing directory (folder) that you want your users' home directory // to be when they log in to the server. If you set it to PATH, the user will - // see the absolute Amazon S3 bucket or EFS paths as is in their file transfer - // protocol clients. If you set it LOGICAL, you need to provide mappings in - // the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS - // paths visible to your users. + // see the absolute Amazon S3 bucket or Amazon EFS path as is in their file + // transfer protocol clients. If you set it to LOGICAL, you need to provide + // mappings in the HomeDirectoryMappings for how you want to make Amazon S3 + // or Amazon EFS paths visible to your users. + // + // If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings + // parameter. If, on the other hand, HomeDirectoryType is PATH, you provide + // an absolute path using the HomeDirectory parameter. You cannot have both + // HomeDirectory and HomeDirectoryMappings in your template. HomeDirectoryType *string `type:"string" enum:"HomeDirectoryType"` // A session policy for your user so that you can use the same Identity and @@ -13167,8 +13148,7 @@ func (s *InputFileLocation) SetS3FileLocation(v *S3InputFileLocation) *InputFile return s } -// This exception is thrown when an error occurs in the Amazon Web ServicesTransfer -// Family service. +// This exception is thrown when an error occurs in the Transfer Family service. type InternalServiceError struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` @@ -14543,9 +14523,9 @@ type ListUsersInput struct { // Specifies the number of users to return as a response to the ListUsers request. MaxResults *int64 `min:"1" type:"integer"` - // When you can get additional results from the ListUsers call, a NextToken - // parameter is returned in the output. You can then pass in a subsequent command - // to the NextToken parameter to continue listing additional users. + // If there are additional results from the ListUsers call, a NextToken parameter + // is returned in the output. You can then pass the NextToken to a subsequent + // ListUsers command, to continue listing additional users. NextToken *string `min:"1" type:"string"` // A system-assigned unique identifier for a server that has users assigned @@ -14797,14 +14777,21 @@ type ListedAccess struct { // using the client. // // A HomeDirectory example is /bucket_name/home/mydirectory. + // + // The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL. HomeDirectory *string `type:"string"` // The type of landing directory (folder) that you want your users' home directory // to be when they log in to the server. If you set it to PATH, the user will - // see the absolute Amazon S3 bucket or EFS paths as is in their file transfer - // protocol clients. If you set it LOGICAL, you need to provide mappings in - // the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS - // paths visible to your users. + // see the absolute Amazon S3 bucket or Amazon EFS path as is in their file + // transfer protocol clients. If you set it to LOGICAL, you need to provide + // mappings in the HomeDirectoryMappings for how you want to make Amazon S3 + // or Amazon EFS paths visible to your users. + // + // If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings + // parameter. If, on the other hand, HomeDirectoryType is PATH, you provide + // an absolute path using the HomeDirectory parameter. You cannot have both + // HomeDirectory and HomeDirectoryMappings in your template. HomeDirectoryType *string `type:"string" enum:"HomeDirectoryType"` // The Amazon Resource Name (ARN) of the Identity and Access Management (IAM) @@ -15456,14 +15443,21 @@ type ListedUser struct { // using the client. // // A HomeDirectory example is /bucket_name/home/mydirectory. + // + // The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL. HomeDirectory *string `type:"string"` // The type of landing directory (folder) that you want your users' home directory // to be when they log in to the server. If you set it to PATH, the user will - // see the absolute Amazon S3 bucket or EFS paths as is in their file transfer - // protocol clients. If you set it LOGICAL, you need to provide mappings in - // the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS - // paths visible to your users. + // see the absolute Amazon S3 bucket or Amazon EFS path as is in their file + // transfer protocol clients. If you set it to LOGICAL, you need to provide + // mappings in the HomeDirectoryMappings for how you want to make Amazon S3 + // or Amazon EFS paths visible to your users. + // + // If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings + // parameter. If, on the other hand, HomeDirectoryType is PATH, you provide + // an absolute path using the HomeDirectory parameter. You cannot have both + // HomeDirectory and HomeDirectoryMappings in your template. HomeDirectoryType *string `type:"string" enum:"HomeDirectoryType"` // The Amazon Resource Name (ARN) of the Identity and Access Management (IAM) @@ -15855,7 +15849,8 @@ func (s *ProtocolDetails) SetTlsSessionResumptionMode(v string) *ProtocolDetails return s } -// The requested resource does not exist. +// The requested resource does not exist, or exists in a region other than the +// one specified for the command. type ResourceExistsException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` @@ -16422,7 +16417,9 @@ type SftpConnectorConfig struct { // key. // // The three standard SSH public key format elements are , , - // and an optional , with spaces between each element. + // and an optional , with spaces between each element. Specify only + // the and : do not enter the portion of the + // key. // // For the trusted host key, Transfer Family accepts RSA and ECDSA keys. // @@ -17138,21 +17135,18 @@ type TestConnectionOutput struct { Status *string `type:"string"` // Returns Connection succeeded if the test is successful. Or, returns a descriptive - // error message if the test fails. The following list provides the details - // for some error messages and troubleshooting steps for each. + // error message if the test fails. The following list provides troubleshooting + // details, depending on the error message that you receive. // - // * Unable to access secrets manager: Verify that your secret name aligns - // with the one in Transfer Role permissions. + // * Verify that your secret name aligns with the one in Transfer Role permissions. // - // * Unknown Host/Connection failed: Verify the server URL in the connector - // configuration , and verify that the login credentials work successfully - // outside of the connector. + // * Verify the server URL in the connector configuration , and verify that + // the login credentials work successfully outside of the connector. // - // * Private key not found: Verify that the secret exists and is formatted - // correctly. + // * Verify that the secret exists and is formatted correctly. // - // * Invalid trusted host keys: Verify that the trusted host key in the connector - // configuration matches the ssh-keyscan output. + // * Verify that the trusted host key in the connector configuration matches + // the ssh-keyscan output. StatusMessage *string `type:"string"` } @@ -17550,6 +17544,8 @@ type UpdateAccessInput struct { // using the client. // // A HomeDirectory example is /bucket_name/home/mydirectory. + // + // The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL. HomeDirectory *string `type:"string"` // Logical directory mappings that specify what Amazon S3 or Amazon EFS paths @@ -17575,10 +17571,15 @@ type UpdateAccessInput struct { // The type of landing directory (folder) that you want your users' home directory // to be when they log in to the server. If you set it to PATH, the user will - // see the absolute Amazon S3 bucket or EFS paths as is in their file transfer - // protocol clients. If you set it LOGICAL, you need to provide mappings in - // the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS - // paths visible to your users. + // see the absolute Amazon S3 bucket or Amazon EFS path as is in their file + // transfer protocol clients. If you set it to LOGICAL, you need to provide + // mappings in the HomeDirectoryMappings for how you want to make Amazon S3 + // or Amazon EFS paths visible to your users. + // + // If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings + // parameter. If, on the other hand, HomeDirectoryType is PATH, you provide + // an absolute path using the HomeDirectory parameter. You cannot have both + // HomeDirectory and HomeDirectoryMappings in your template. HomeDirectoryType *string `type:"string" enum:"HomeDirectoryType"` // A session policy for your user so that you can use the same Identity and @@ -18885,6 +18886,8 @@ type UpdateUserInput struct { // using the client. // // A HomeDirectory example is /bucket_name/home/mydirectory. + // + // The HomeDirectory parameter is only used if HomeDirectoryType is set to LOGICAL. HomeDirectory *string `type:"string"` // Logical directory mappings that specify what Amazon S3 or Amazon EFS paths @@ -18910,10 +18913,15 @@ type UpdateUserInput struct { // The type of landing directory (folder) that you want your users' home directory // to be when they log in to the server. If you set it to PATH, the user will - // see the absolute Amazon S3 bucket or EFS paths as is in their file transfer - // protocol clients. If you set it LOGICAL, you need to provide mappings in - // the HomeDirectoryMappings for how you want to make Amazon S3 or Amazon EFS - // paths visible to your users. + // see the absolute Amazon S3 bucket or Amazon EFS path as is in their file + // transfer protocol clients. If you set it to LOGICAL, you need to provide + // mappings in the HomeDirectoryMappings for how you want to make Amazon S3 + // or Amazon EFS paths visible to your users. + // + // If HomeDirectoryType is LOGICAL, you must provide mappings, using the HomeDirectoryMappings + // parameter. If, on the other hand, HomeDirectoryType is PATH, you provide + // an absolute path using the HomeDirectory parameter. You cannot have both + // HomeDirectory and HomeDirectoryMappings in your template. HomeDirectoryType *string `type:"string" enum:"HomeDirectoryType"` // A session policy for your user so that you can use the same Identity and diff --git a/service/transfer/errors.go b/service/transfer/errors.go index 524b2d66cd2..5b1ee2200a8 100644 --- a/service/transfer/errors.go +++ b/service/transfer/errors.go @@ -25,8 +25,7 @@ const ( // ErrCodeInternalServiceError for service response error code // "InternalServiceError". // - // This exception is thrown when an error occurs in the Amazon Web ServicesTransfer - // Family service. + // This exception is thrown when an error occurs in the Transfer Family service. ErrCodeInternalServiceError = "InternalServiceError" // ErrCodeInvalidNextTokenException for service response error code @@ -44,7 +43,8 @@ const ( // ErrCodeResourceExistsException for service response error code // "ResourceExistsException". // - // The requested resource does not exist. + // The requested resource does not exist, or exists in a region other than the + // one specified for the command. ErrCodeResourceExistsException = "ResourceExistsException" // ErrCodeResourceNotFoundException for service response error code