An array of Channel objects. Each channel is a named input source. InputDataConfig describes the input data and its location.
Algorithms can accept input data from one or more channels. For example, an algorithm might have two channels of input data, training_data and validation_data. The configuration for each channel provides the S3, EFS, or FSx location where the input data is stored. It also provides information about the stored data: the MIME type, compression method, and whether the data is wrapped in RecordIO format.
Depending on the input mode that the algorithm supports, SageMaker either copies input data files from an S3 bucket to a local directory in the Docker container, or makes it available as input streams. For example, if you specify an EFS location, input data files are available as input streams. They do not need to be downloaded.
", + "CreateTrainingJobRequest$InputDataConfig": "An array of Channel objects. Each channel is a named input source. InputDataConfig describes the input data and its location.
Algorithms can accept input data from one or more channels. For example, an algorithm might have two channels of input data, training_data and validation_data. The configuration for each channel provides the S3, EFS, or FSx location where the input data is stored. It also provides information about the stored data: the MIME type, compression method, and whether the data is wrapped in RecordIO format.
Depending on the input mode that the algorithm supports, SageMaker either copies input data files from an S3 bucket to a local directory in the Docker container, or makes it available as input streams. For example, if you specify an EFS location, input data files are available as input streams. They do not need to be downloaded.
Your input must be in the same Amazon Web Services region as your training job.
", "DescribeTrainingJobResponse$InputDataConfig": "An array of Channel objects that describes each data input channel.
An array of Channel objects that specify the input for the training jobs that the tuning job launches.
", - "TrainingJob$InputDataConfig": "An array of Channel objects that describes each data input channel.
An array of Channel objects that describes each data input channel.
Your input must be in the same Amazon Web Services region as your training job.
", "TrainingJobDefinition$InputDataConfig": "An array of Channel objects, each of which specifies an input source.
The current attempt of the execution step. For more information, see Retry Policy for SageMaker Pipelines steps.
" } }, + "InvocationEndTime": { + "base": null, + "refs": { + "InferenceRecommendation$InvocationEndTime": "A timestamp that shows when the benchmark completed.
", + "RecommendationJobInferenceBenchmark$InvocationEndTime": "A timestamp that shows when the benchmark completed.
" + } + }, + "InvocationStartTime": { + "base": null, + "refs": { + "InferenceRecommendation$InvocationStartTime": "A timestamp that shows when the benchmark started.
", + "RecommendationJobInferenceBenchmark$InvocationStartTime": "A timestamp that shows when the benchmark started.
" + } + }, "InvocationsMaxRetries": { "base": null, "refs": { @@ -8745,6 +8759,8 @@ "DescribeModelInput$ModelName": "The name of the model.
", "DescribeModelOutput$ModelName": "Name of the SageMaker model.
", "DescribeTransformJobResponse$ModelName": "The name of the model used in the transform job.
", + "InferenceRecommendationsJob$ModelName": "The name of the created model.
", + "ListInferenceRecommendationsJobsRequest$ModelNameEquals": "A filter that returns only jobs that were created for this model.
", "Model$ModelName": "The name of the model.
", "ModelSummary$ModelName": "The name of the model that you want a summary for.
", "ModelVariantConfig$ModelName": "The name of the Amazon SageMaker Model entity.
", @@ -8775,6 +8791,8 @@ "CreateModelPackageOutput$ModelPackageArn": "The Amazon Resource Name (ARN) of the new model package.
", "DescribeCompilationJobResponse$ModelPackageVersionArn": "The Amazon Resource Name (ARN) of the versioned model package that was provided to SageMaker Neo when you initiated a compilation job.
", "DescribeModelPackageOutput$ModelPackageArn": "The Amazon Resource Name (ARN) of the model package.
", + "InferenceRecommendationsJob$ModelPackageVersionArn": "The Amazon Resource Name (ARN) of a versioned model package.
", + "ListInferenceRecommendationsJobsRequest$ModelPackageVersionArnEquals": "A filter that returns only jobs that were created for this versioned model package.
", "ModelPackage$ModelPackageArn": "The Amazon Resource Name (ARN) of the model package.
", "ModelPackageArnList$member": null, "ModelPackageSummaries$key": null, @@ -11713,7 +11731,7 @@ } }, "S3DataSource": { - "base": "Describes the S3 data source.
", + "base": "Describes the S3 data source.
Your input bucket must be in the same Amazon Web Services region as your training job.
", "refs": { "DataSource$S3DataSource": "The S3 location of the data source that is associated with a channel.
" } @@ -11757,6 +11775,7 @@ "EdgeOutputConfig$S3OutputLocation": "The Amazon Simple Storage (S3) bucker URI.
", "FileSource$S3Uri": "The Amazon S3 URI for the file source.
", "FlowDefinitionOutputConfig$S3OutputPath": "The Amazon S3 path where the object containing human output will be made available.
To learn more about the format of Amazon A2I output data, see Amazon A2I Output Data.
", + "InferenceRecommendationsJob$SamplePayloadUrl": "The Amazon Simple Storage Service (Amazon S3) path where the sample payload is stored. This path must point to a single gzip compressed tar archive (.tar.gz suffix).
", "InputConfig$S3Uri": "The S3 path where the model artifacts, which result from model training, are stored. This path must point to a single gzip compressed tar archive (.tar.gz suffix).
", "LabelingJobOutput$OutputDatasetS3Uri": "The Amazon S3 bucket location of the manifest file for labeled data.
", "LabelingJobOutputConfig$S3OutputPath": "The Amazon S3 location to write output data.
", @@ -11782,7 +11801,7 @@ "ProfilerRuleConfiguration$S3OutputPath": "Path to Amazon S3 storage location for rules.
", "RecommendationJobCompiledOutputConfig$S3OutputUri": "Identifies the Amazon S3 bucket where you want SageMaker to store the compiled model artifacts.
", "RedshiftDatasetDefinition$OutputS3Uri": "The location in Amazon S3 where the Redshift query results are stored.
", - "S3DataSource$S3Uri": "Depending on the value specified for the S3DataType, identifies either a key name prefix or a manifest. For example:
A key name prefix might look like this: s3://bucketname/exampleprefix
A manifest might look like this: s3://bucketname/example.manifest
A manifest is an S3 object which is a JSON file consisting of an array of elements. The first element is a prefix which is followed by one or more suffixes. SageMaker appends the suffix elements to the prefix to get a full set of S3Uri. Note that the prefix must be a valid non-empty S3Uri that precludes users from specifying a manifest whose individual S3Uri is sourced from different S3 buckets.
The following code example shows a valid manifest format:
[ {\"prefix\": \"s3://customer_bucket/some/prefix/\"},
\"relative/path/to/custdata-1\",
\"relative/path/custdata-2\",
...
\"relative/path/custdata-N\"
]
This JSON is equivalent to the following S3Uri list:
s3://customer_bucket/some/prefix/relative/path/to/custdata-1
s3://customer_bucket/some/prefix/relative/path/custdata-2
...
s3://customer_bucket/some/prefix/relative/path/custdata-N
The complete set of S3Uri in this manifest is the input data for the channel for this data source. The object that each S3Uri points to must be readable by the IAM role that SageMaker uses to perform tasks on your behalf.
Depending on the value specified for the S3DataType, identifies either a key name prefix or a manifest. For example:
A key name prefix might look like this: s3://bucketname/exampleprefix
A manifest might look like this: s3://bucketname/example.manifest
A manifest is an S3 object which is a JSON file consisting of an array of elements. The first element is a prefix which is followed by one or more suffixes. SageMaker appends the suffix elements to the prefix to get a full set of S3Uri. Note that the prefix must be a valid non-empty S3Uri that precludes users from specifying a manifest whose individual S3Uri is sourced from different S3 buckets.
The following code example shows a valid manifest format:
[ {\"prefix\": \"s3://customer_bucket/some/prefix/\"},
\"relative/path/to/custdata-1\",
\"relative/path/custdata-2\",
...
\"relative/path/custdata-N\"
]
This JSON is equivalent to the following S3Uri list:
s3://customer_bucket/some/prefix/relative/path/to/custdata-1
s3://customer_bucket/some/prefix/relative/path/custdata-2
...
s3://customer_bucket/some/prefix/relative/path/custdata-N
The complete set of S3Uri in this manifest is the input data for the channel for this data source. The object that each S3Uri points to must be readable by the IAM role that SageMaker uses to perform tasks on your behalf.
Your input bucket must be located in same Amazon Web Services region as your training job.
", "S3StorageConfig$S3Uri": "The S3 URI, or location in Amazon S3, of OfflineStore.
S3 URIs have a format similar to the following: s3://example-bucket/prefix/.
The S3 path where offline records are written.
", "SharingSettings$S3OutputPath": "When NotebookOutputOption is Allowed, the Amazon S3 bucket used to store the shared notebook snapshots.
The uniform resource identifier (URI) of the S3 bucket where the SHAP baseline file is stored. The format of the SHAP baseline file should be the same format as the format of the training dataset. For example, if the training dataset is in CSV format, and each record in the training dataset has four features, and all features are numerical, then the baseline file should also have this same format. Each record should contain only the features. If you are using a virtual private cloud (VPC), the ShapBaselineUri should be accessible to the VPC. For more information about setting up endpoints with Amazon Virtual Private Cloud, see Give SageMaker access to Resources in your Amazon Virtual Private Cloud.
The S3 path where the model artifacts, which result from model training, are stored. This path must point to a single gzip compressed tar archive (.tar.gz suffix). The S3 path is required for SageMaker built-in algorithms, but not if you use your own algorithms. For more information on built-in algorithms, see Common Parameters.
The model artifacts must be in an S3 bucket that is in the same region as the model or endpoint you are creating.
If you provide a value for this parameter, SageMaker uses Amazon Web Services Security Token Service to download model artifacts from the S3 path you provide. Amazon Web Services STS is activated in your Amazon Web Services account by default. If you previously deactivated Amazon Web Services STS for a region, you need to reactivate Amazon Web Services STS for that region. For more information, see Activating and Deactivating Amazon Web Services STS in an Amazon Web Services Region in the Amazon Web Services Identity and Access Management User Guide.
If you use a built-in algorithm to create a model, SageMaker requires that you provide a S3 path to the model artifacts in ModelDataUrl.
The Amazon S3 path where the model artifacts, which result from model training, are stored. This path must point to a single gzip compressed tar archive (.tar.gz suffix).
The model artifacts must be in an S3 bucket that is in the same region as the model package.
The Amazon S3 path where the model artifacts, which result from model training, are stored. This path must point to a single gzip compressed tar archive (.tar.gz suffix).
The model artifacts must be in an S3 bucket that is in the same region as the algorithm.
The Amazon S3 path where the model artifacts, which result from model training, are stored. This path must point to a single gzip compressed tar archive (.tar.gz suffix).
The model artifacts must be in an S3 bucket that is in the same Amazon Web Services region as the algorithm.
Starts an asynchronous batch translation job. Use batch translation jobs to translate large volumes of text across multiple documents at once. For batch translation, you can input documents with different source languages (specify auto as the source language). You can specify one or more target languages. Batch translation translates each input document into each of the target languages. For more information, see Asynchronous batch processing.
Batch translation jobs can be described with the DescribeTextTranslationJob operation, listed with the ListTextTranslationJobs operation, and stopped with the StopTextTranslationJob operation.
", "StopTextTranslationJob": "Stops an asynchronous batch translation job that is in progress.
If the job's state is IN_PROGRESS, the job will be marked for termination and put into the STOP_REQUESTED state. If the job completes before it can be stopped, it is put into the COMPLETED state. Otherwise, the job is put into the STOPPED state.
Asynchronous batch translation jobs are started with the StartTextTranslationJob operation. You can use the DescribeTextTranslationJob or ListTextTranslationJobs operations to get a batch translation job's JobId.
Associates a specific tag with a resource. A tag is a key-value pair that adds as a metadata to a resource. For more information, see Tagging your resources.
", + "TranslateDocument": "Translates the input document from the source language to the target language. This synchronous operation supports plain text or HTML for the input document. TranslateDocument supports translations from English to any supported language, and from any supported language to English. Therefore, specify either the source language code or the target language code as “en” (English).
TranslateDocument does not support language auto-detection.
If you set the Formality parameter, the request will fail if the target language does not support formality. For a list of target languages that support formality, see Setting formality.
Translates input text from the source language to the target language. For a list of available languages and language codes, see Supported languages.
", "UntagResource": "Removes a specific tag associated with an Amazon Translate resource. For more information, see Tagging your resources.
", "UpdateParallelData": "Updates a previously created parallel data resource by importing a new input file from Amazon S3.
" @@ -31,6 +32,7 @@ "AppliedTerminologyList": { "base": null, "refs": { + "TranslateDocumentResponse$AppliedTerminologies": "The names of the custom terminologies applied to the input text by Amazon Translate to produce the translated text document.
", "TranslateTextResponse$AppliedTerminologies": "The names of the custom terminologies applied to the input text by Amazon Translate for the translated text response.
" } }, @@ -61,6 +63,7 @@ "ContentType": { "base": null, "refs": { + "Document$ContentType": "Describes the format of the document. You can specify one of the following:
text/html - The input data consists of HTML content. Amazon Translate translates only the text in the HTML element.
text/plain - The input data consists of unformatted text. Amazon Translate translates every character in the content.
Describes the format of the data that you submit to Amazon Translate as input. You can specify one of the following multipurpose internet mail extension (MIME) types:
text/html: The input data consists of one or more HTML files. Amazon Translate translates only the text that resides in the html element in each file.
text/plain: The input data consists of one or more unformatted text files. Amazon Translate translates every character in this type of input.
application/vnd.openxmlformats-officedocument.wordprocessingml.document: The input data consists of one or more Word documents (.docx).
application/vnd.openxmlformats-officedocument.presentationml.presentation: The input data consists of one or more PowerPoint Presentation files (.pptx).
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet: The input data consists of one or more Excel Workbook files (.xlsx).
application/x-xliff+xml: The input data consists of one or more XML Localization Interchange File Format (XLIFF) files (.xlf). Amazon Translate supports only XLIFF version 1.2.
If you structure your input data as HTML, ensure that you set this parameter to text/html. By doing so, you cut costs by limiting the translation to the contents of the html element in each file. Otherwise, if you set this parameter to text/plain, your costs will cover the translation of every character.
The language code passed in with the request.
" } }, + "Document": { + "base": "The content and content type of a document.
", + "refs": { + "TranslateDocumentRequest$Document": "The content and content type for the document to be translated. The document size must not exceed 100 KB.
" + } + }, + "DocumentContent": { + "base": null, + "refs": { + "Document$Content": "The Contentfield type is Binary large object (blob). This object contains the document content converted into base64-encoded binary data. If you use one of the AWS SDKs, the SDK performs the Base64-encoding on this field before sending the request.
The encryption key used to encrypt this object.
", "refs": { @@ -281,8 +296,12 @@ "TargetLanguageCodeStringList$member": null, "TerminologyProperties$SourceLanguageCode": "The language code for the source text of the translation request for which the custom terminology is being used.
", "TextTranslationJobProperties$SourceLanguageCode": "The language code of the language of the source text. The language must be a language supported by Amazon Translate.
", - "TranslateTextRequest$SourceLanguageCode": "The language code for the language of the source text. The language must be a language supported by Amazon Translate. For a list of language codes, see Supported languages.
To have Amazon Translate determine the source language of your text, you can specify auto in the SourceLanguageCode field. If you specify auto, Amazon Translate will call Amazon Comprehend to determine the source language.
If you specify auto, you must send the TranslateText request in a region that supports Amazon Comprehend. Otherwise, the request returns an error indicating that autodetect is not supported.
The language code requested for the language of the target text. The language must be a language supported by Amazon Translate.
", + "TranslateDocumentRequest$SourceLanguageCode": "The language code for the language of the source text. Do not use auto, because TranslateDocument does not support language auto-detection. For a list of supported language codes, see Supported languages.
The language code requested for the translated document. For a list of supported language codes, see Supported languages.
", + "TranslateDocumentResponse$SourceLanguageCode": "The language code of the source document.
", + "TranslateDocumentResponse$TargetLanguageCode": "The language code of the translated document.
", + "TranslateTextRequest$SourceLanguageCode": "The language code for the language of the source text. For a list of language codes, see Supported languages.
To have Amazon Translate determine the source language of your text, you can specify auto in the SourceLanguageCode field. If you specify auto, Amazon Translate will call Amazon Comprehend to determine the source language.
If you specify auto, you must send the TranslateText request in a region that supports Amazon Comprehend. Otherwise, the request returns an error indicating that autodetect is not supported.
The language code requested for the language of the target text. For a list of language codes, see Supported languages.
", "TranslateTextResponse$SourceLanguageCode": "The language code for the language of the source text.
", "TranslateTextResponse$TargetLanguageCode": "The language code for the language of the target text.
", "UnsupportedDisplayLanguageCodeException$DisplayLanguageCode": "Language code passed in with the request.
", @@ -501,7 +520,8 @@ "StartTextTranslationJobRequest$ParallelDataNames": "The name of a parallel data resource to add to the translation job. This resource consists of examples that show how you want segments of text to be translated. If you specify multiple target languages for the job, the parallel data file must include translations for all the target languages.
When you add parallel data to a translation job, you create an Active Custom Translation job.
This parameter accepts only one parallel data resource.
Active Custom Translation jobs are priced at a higher rate than other jobs that don't use parallel data. For more information, see Amazon Translate pricing.
For a list of available parallel data resources, use the ListParallelData operation.
For more information, see Customizing your translations with parallel data.
", "TextTranslationJobProperties$TerminologyNames": "A list containing the names of the terminologies applied to a translation job. Only one terminology can be applied per StartTextTranslationJob request at this time.
", "TextTranslationJobProperties$ParallelDataNames": "A list containing the names of the parallel data resources applied to the translation job.
", - "TranslateTextRequest$TerminologyNames": "The name of the terminology list file to be used in the TranslateText request. You can use 1 terminology list at most in a TranslateText request. Terminology lists can contain a maximum of 256 terms.
The name of a terminology list file to add to the translation job. This file provides source terms and the desired translation for each term. A terminology list can contain a maximum of 256 terms. You can use one custom terminology resource in your translation request.
Use the ListTerminologies operation to get the available terminology lists.
For more information about custom terminology lists, see Custom terminology.
", + "TranslateTextRequest$TerminologyNames": "The name of a terminology list file to add to the translation job. This file provides source terms and the desired translation for each term. A terminology list can contain a maximum of 256 terms. You can use one custom terminology resource in your translation request.
Use the ListTerminologies operation to get the available terminology lists.
For more information about custom terminology lists, see Custom terminology.
" } }, "ResourceNotFoundException": { @@ -728,6 +748,16 @@ "refs": { } }, + "TranslateDocumentRequest": { + "base": null, + "refs": { + } + }, + "TranslateDocumentResponse": { + "base": null, + "refs": { + } + }, "TranslateTextRequest": { "base": null, "refs": { @@ -738,6 +768,18 @@ "refs": { } }, + "TranslatedDocument": { + "base": "The translated content.
", + "refs": { + "TranslateDocumentResponse$TranslatedDocument": "The document containing the translated content. The document format matches the source document format.
" + } + }, + "TranslatedDocumentContent": { + "base": null, + "refs": { + "TranslatedDocument$Content": "The document containing the translated content.
" + } + }, "TranslatedTextString": { "base": null, "refs": { @@ -745,12 +787,14 @@ } }, "TranslationSettings": { - "base": "Optional settings that configure the translation output. Use these settings for real time translations and asynchronous translation jobs.
", + "base": "Settings to configure your translation output, including the option to set the formality level of the output text and the option to mask profane words and phrases.
", "refs": { "StartTextTranslationJobRequest$Settings": "Settings to configure your translation output, including the option to set the formality level of the output text and the option to mask profane words and phrases.
", - "TextTranslationJobProperties$Settings": "Settings that configure the translation output.
", + "TextTranslationJobProperties$Settings": "Settings that modify the translation output.
", + "TranslateDocumentRequest$Settings": null, + "TranslateDocumentResponse$AppliedSettings": null, "TranslateTextRequest$Settings": "Settings to configure your translation output, including the option to set the formality level of the output text and the option to mask profane words and phrases.
", - "TranslateTextResponse$AppliedSettings": "Settings that configure the translation output.
" + "TranslateTextResponse$AppliedSettings": "Optional settings that modify the translation output.
" } }, "UnboundedLengthString": { @@ -767,7 +811,7 @@ } }, "UnsupportedLanguagePairException": { - "base": "Amazon Translate does not support translation from the language of the source text into the requested target language. For more information, see Error messages.
", + "base": "Amazon Translate does not support translation from the language of the source text into the requested target language. For more information, see Supported languages.
", "refs": { } }, diff --git a/models/apis/translate/2017-07-01/endpoint-rule-set-1.json b/models/apis/translate/2017-07-01/endpoint-rule-set-1.json index 3d315dcea2f..44b476b069c 100644 --- a/models/apis/translate/2017-07-01/endpoint-rule-set-1.json +++ b/models/apis/translate/2017-07-01/endpoint-rule-set-1.json @@ -3,7 +3,7 @@ "parameters": { "Region": { "builtIn": "AWS::Region", - "required": true, + "required": false, "documentation": "The AWS region used to dispatch the request.", "type": "String" }, @@ -32,13 +32,12 @@ { "conditions": [ { - "fn": "aws.partition", + "fn": "isSet", "argv": [ { - "ref": "Region" + "ref": "Endpoint" } - ], - "assign": "PartitionResult" + ] } ], "type": "tree", @@ -46,14 +45,20 @@ { "conditions": [ { - "fn": "isSet", + "fn": "booleanEquals", "argv": [ { - "ref": "Endpoint" - } + "ref": "UseFIPS" + }, + true ] } ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], "type": "tree", "rules": [ { @@ -62,67 +67,42 @@ "fn": "booleanEquals", "argv": [ { - "ref": "UseFIPS" + "ref": "UseDualStack" }, true ] } ], - "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", "type": "error" }, { "conditions": [], - "type": "tree", - "rules": [ - { - "conditions": [ - { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseDualStack" - }, - true - ] - } - ], - "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", - "type": "error" + "endpoint": { + "url": { + "ref": "Endpoint" }, - { - "conditions": [], - "endpoint": { - "url": { - "ref": "Endpoint" - }, - "properties": {}, - "headers": {} - }, - "type": "endpoint" - } - ] + "properties": {}, + "headers": {} + }, + "type": "endpoint" } ] - }, + } + ] + }, + { + "conditions": [], + "type": "tree", + "rules": [ { "conditions": [ { - "fn": "booleanEquals", - "argv": [ - { - "ref": "UseFIPS" - }, - true - ] - }, - { - "fn": "booleanEquals", + "fn": "isSet", "argv": [ { - "ref": "UseDualStack" - }, - true + "ref": "Region" + } ] } ], @@ -131,90 +111,215 @@ { "conditions": [ { - "fn": "booleanEquals", + "fn": "aws.partition", "argv": [ - true, { - "fn": "getAttr", + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] }, - "supportsFIPS" + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://translate-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" } ] }, { - "fn": "booleanEquals", - "argv": [ - true, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseFIPS" }, - "supportsDualStack" + true ] } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://translate-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } ] - } - ], - "type": "tree", - "rules": [ - { - "conditions": [], - "endpoint": { - "url": "https://translate-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, + "conditions": [ { - "fn": "getAttr", + "fn": "booleanEquals", "argv": [ { - "ref": "PartitionResult" + "ref": "UseDualStack" }, - "supportsFIPS" + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://translate.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" } ] - } - ], - "type": "tree", - "rules": [ + }, { "conditions": [], "type": "tree", @@ -222,7 +327,7 @@ { "conditions": [], "endpoint": { - "url": "https://translate-fips.{Region}.{PartitionResult#dnsSuffix}", + "url": "https://translate.{Region}.{PartitionResult#dnsSuffix}", "properties": {}, "headers": {} }, @@ -231,74 +336,13 @@ ] } ] - }, - { - "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://translate.{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://translate.{Region}.{PartitionResult#dnsSuffix}", - "properties": {}, - "headers": {} - }, - "type": "endpoint" + "error": "Invalid Configuration: Missing Region", + "type": "error" } ] } diff --git a/models/apis/translate/2017-07-01/endpoint-tests-1.json b/models/apis/translate/2017-07-01/endpoint-tests-1.json index 6b9d67a5fdd..2984854f21c 100644 --- a/models/apis/translate/2017-07-01/endpoint-tests-1.json +++ b/models/apis/translate/2017-07-01/endpoint-tests-1.json @@ -1,42 +1,42 @@ { "testCases": [ { - "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled", + "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate-fips.ap-south-1.api.aws" + "url": "https://translate.ap-east-1.amazonaws.com" } }, "params": { - "UseFIPS": true, - "UseDualStack": true, - "Region": "ap-south-1" + "Region": "ap-east-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled", + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate-fips.ap-south-1.amazonaws.com" + "url": "https://translate.ap-northeast-1.amazonaws.com" } }, "params": { - "UseFIPS": true, - "UseDualStack": false, - "Region": "ap-south-1" + "Region": "ap-northeast-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled", + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate.ap-south-1.api.aws" + "url": "https://translate.ap-northeast-2.amazonaws.com" } }, "params": { + "Region": "ap-northeast-2", "UseFIPS": false, - "UseDualStack": true, - "Region": "ap-south-1" + "UseDualStack": false } }, { @@ -47,48 +47,35 @@ } }, "params": { + "Region": "ap-south-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "ap-south-1" + "UseDualStack": false } }, { - "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.ca-central-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": true, - "Region": "ca-central-1" - } - }, - { - "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate-fips.ca-central-1.amazonaws.com" + "url": "https://translate.ap-southeast-1.amazonaws.com" } }, "params": { - "UseFIPS": true, - "UseDualStack": false, - "Region": "ca-central-1" + "Region": "ap-southeast-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled", + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate.ca-central-1.api.aws" + "url": "https://translate.ap-southeast-2.amazonaws.com" } }, "params": { + "Region": "ap-southeast-2", "UseFIPS": false, - "UseDualStack": true, - "Region": "ca-central-1" + "UseDualStack": false } }, { @@ -99,48 +86,9 @@ } }, "params": { + "Region": "ca-central-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "ca-central-1" - } - }, - { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.eu-central-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": true, - "Region": "eu-central-1" - } - }, - { - "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.eu-central-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": false, - "Region": "eu-central-1" - } - }, - { - "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate.eu-central-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "UseDualStack": true, - "Region": "eu-central-1" + "UseDualStack": false } }, { @@ -151,152 +99,9 @@ } }, "params": { + "Region": "eu-central-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "eu-central-1" - } - }, - { - "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.us-west-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": true, - "Region": "us-west-1" - } - }, - { - "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.us-west-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": false, - "Region": "us-west-1" - } - }, - { - "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate.us-west-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "UseDualStack": true, - "Region": "us-west-1" - } - }, - { - "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://translate.us-west-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "UseDualStack": false, - "Region": "us-west-1" - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.us-west-2.api.aws" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": true, - "Region": "us-west-2" - } - }, - { - "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.us-west-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": false, - "Region": "us-west-2" - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate.us-west-2.api.aws" - } - }, - "params": { - "UseFIPS": false, - "UseDualStack": true, - "Region": "us-west-2" - } - }, - { - "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://translate.us-west-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "UseDualStack": false, - "Region": "us-west-2" - } - }, - { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.eu-north-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": true, - "Region": "eu-north-1" - } - }, - { - "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.eu-north-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": false, - "Region": "eu-north-1" - } - }, - { - "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate.eu-north-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "UseDualStack": true, - "Region": "eu-north-1" + "UseDualStack": false } }, { @@ -307,48 +112,35 @@ } }, "params": { + "Region": "eu-north-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "eu-north-1" + "UseDualStack": false } }, { - "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.eu-west-3.api.aws" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": true, - "Region": "eu-west-3" - } - }, - { - "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled", + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate-fips.eu-west-3.amazonaws.com" + "url": "https://translate.eu-west-1.amazonaws.com" } }, "params": { - "UseFIPS": true, - "UseDualStack": false, - "Region": "eu-west-3" + "Region": "eu-west-1", + "UseFIPS": false, + "UseDualStack": false } }, { - "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled", + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate.eu-west-3.api.aws" + "url": "https://translate.eu-west-2.amazonaws.com" } }, "params": { + "Region": "eu-west-2", "UseFIPS": false, - "UseDualStack": true, - "Region": "eu-west-3" + "UseDualStack": false } }, { @@ -359,308 +151,178 @@ } }, "params": { + "Region": "eu-west-3", "UseFIPS": false, - "UseDualStack": false, - "Region": "eu-west-3" - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.eu-west-2.api.aws" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": true, - "Region": "eu-west-2" - } - }, - { - "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.eu-west-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": false, - "Region": "eu-west-2" - } - }, - { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate.eu-west-2.api.aws" - } - }, - "params": { - "UseFIPS": false, - "UseDualStack": true, - "Region": "eu-west-2" + "UseDualStack": false } }, { - "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate.eu-west-2.amazonaws.com" + "url": "https://translate.us-east-1.amazonaws.com" } }, "params": { + "Region": "us-east-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "eu-west-2" + "UseDualStack": false } }, { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.eu-west-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": true, - "Region": "eu-west-1" - } - }, - { - "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate-fips.eu-west-1.amazonaws.com" + "url": "https://translate-fips.us-east-1.amazonaws.com" } }, "params": { + "Region": "us-east-1", "UseFIPS": true, - "UseDualStack": false, - "Region": "eu-west-1" - } - }, - { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate.eu-west-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "UseDualStack": true, - "Region": "eu-west-1" + "UseDualStack": false } }, { - "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate.eu-west-1.amazonaws.com" + "url": "https://translate.us-east-2.amazonaws.com" } }, "params": { + "Region": "us-east-2", "UseFIPS": false, - "UseDualStack": false, - "Region": "eu-west-1" + "UseDualStack": false } }, { - "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.ap-northeast-2.api.aws" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": true, - "Region": "ap-northeast-2" - } - }, - { - "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate-fips.ap-northeast-2.amazonaws.com" + "url": "https://translate-fips.us-east-2.amazonaws.com" } }, "params": { + "Region": "us-east-2", "UseFIPS": true, - "UseDualStack": false, - "Region": "ap-northeast-2" + "UseDualStack": false } }, { - "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate.ap-northeast-2.api.aws" + "url": "https://translate.us-west-1.amazonaws.com" } }, "params": { + "Region": "us-west-1", "UseFIPS": false, - "UseDualStack": true, - "Region": "ap-northeast-2" + "UseDualStack": false } }, { - "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate.ap-northeast-2.amazonaws.com" + "url": "https://translate.us-west-2.amazonaws.com" } }, "params": { + "Region": "us-west-2", "UseFIPS": false, - "UseDualStack": false, - "Region": "ap-northeast-2" + "UseDualStack": false } }, { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate-fips.ap-northeast-1.api.aws" + "url": "https://translate-fips.us-west-2.amazonaws.com" } }, "params": { + "Region": "us-west-2", "UseFIPS": true, - "UseDualStack": true, - "Region": "ap-northeast-1" + "UseDualStack": false } }, { - "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://translate-fips.ap-northeast-1.amazonaws.com" + "url": "https://translate-fips.us-east-1.api.aws" } }, "params": { + "Region": "us-east-1", "UseFIPS": true, - "UseDualStack": false, - "Region": "ap-northeast-1" + "UseDualStack": true } }, { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate.ap-northeast-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "UseDualStack": true, - "Region": "ap-northeast-1" - } - }, - { - "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://translate.ap-northeast-1.amazonaws.com" + "url": "https://translate.us-east-1.api.aws" } }, "params": { + "Region": "us-east-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "ap-northeast-1" + "UseDualStack": true } }, { - "documentation": "For region ap-east-1 with FIPS enabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://translate-fips.ap-east-1.api.aws" + "url": "https://translate-fips.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { + "Region": "cn-north-1", "UseFIPS": true, - "UseDualStack": true, - "Region": "ap-east-1" + "UseDualStack": true } }, { - "documentation": "For region ap-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate-fips.ap-east-1.amazonaws.com" + "url": "https://translate-fips.cn-north-1.amazonaws.com.cn" } }, "params": { + "Region": "cn-north-1", "UseFIPS": true, - "UseDualStack": false, - "Region": "ap-east-1" - } - }, - { - "documentation": "For region ap-east-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate.ap-east-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "UseDualStack": true, - "Region": "ap-east-1" + "UseDualStack": false } }, { - "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://translate.ap-east-1.amazonaws.com" + "url": "https://translate.cn-north-1.api.amazonwebservices.com.cn" } }, "params": { + "Region": "cn-north-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "ap-east-1" + "UseDualStack": true } }, { - "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled", + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate-fips.us-gov-west-1.api.aws" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": true, - "Region": "us-gov-west-1" - } - }, - { - "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.us-gov-west-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": false, - "Region": "us-gov-west-1" - } - }, - { - "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate.us-gov-west-1.api.aws" + "url": "https://translate.cn-north-1.amazonaws.com.cn" } }, "params": { + "Region": "cn-north-1", "UseFIPS": false, - "UseDualStack": true, - "Region": "us-gov-west-1" + "UseDualStack": false } }, { @@ -671,113 +333,87 @@ } }, "params": { + "Region": "us-gov-west-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "us-gov-west-1" + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate-fips.ap-southeast-1.api.aws" + "url": "https://translate-fips.us-gov-west-1.amazonaws.com" } }, "params": { + "Region": "us-gov-west-1", "UseFIPS": true, - "UseDualStack": true, - "Region": "ap-southeast-1" + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://translate-fips.ap-southeast-1.amazonaws.com" + "url": "https://translate-fips.us-gov-east-1.api.aws" } }, "params": { + "Region": "us-gov-east-1", "UseFIPS": true, - "UseDualStack": false, - "Region": "ap-southeast-1" + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate.ap-southeast-1.api.aws" - } - }, - "params": { - "UseFIPS": false, - "UseDualStack": true, - "Region": "ap-southeast-1" - } - }, - { - "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://translate.ap-southeast-1.amazonaws.com" - } - }, - "params": { - "UseFIPS": false, - "UseDualStack": false, - "Region": "ap-southeast-1" - } - }, - { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.ap-southeast-2.api.aws" + "url": "https://translate-fips.us-gov-east-1.amazonaws.com" } }, "params": { + "Region": "us-gov-east-1", "UseFIPS": true, - "UseDualStack": true, - "Region": "ap-southeast-2" + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", "expect": { "endpoint": { - "url": "https://translate-fips.ap-southeast-2.amazonaws.com" + "url": "https://translate.us-gov-east-1.api.aws" } }, "params": { - "UseFIPS": true, - "UseDualStack": false, - "Region": "ap-southeast-2" + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": true } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate.ap-southeast-2.api.aws" + "url": "https://translate.us-gov-east-1.amazonaws.com" } }, "params": { + "Region": "us-gov-east-1", "UseFIPS": false, - "UseDualStack": true, - "Region": "ap-southeast-2" + "UseDualStack": false } }, { - "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate.ap-southeast-2.amazonaws.com" + "url": "https://translate.us-iso-east-1.c2s.ic.gov" } }, "params": { + "Region": "us-iso-east-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "ap-southeast-2" + "UseDualStack": false } }, { @@ -786,9 +422,9 @@ "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, - "Region": "us-iso-east-1" + "UseDualStack": true } }, { @@ -799,9 +435,9 @@ } }, "params": { + "Region": "us-iso-east-1", "UseFIPS": true, - "UseDualStack": false, - "Region": "us-iso-east-1" + "UseDualStack": false } }, { @@ -810,130 +446,75 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { + "Region": "us-iso-east-1", "UseFIPS": false, - "UseDualStack": true, - "Region": "us-iso-east-1" + "UseDualStack": true } }, { - "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://translate.us-iso-east-1.c2s.ic.gov" - } - }, - "params": { - "UseFIPS": false, - "UseDualStack": false, - "Region": "us-iso-east-1" - } - }, - { - "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.us-east-1.api.aws" - } + "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, - "Region": "us-east-1" + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate-fips.us-east-1.amazonaws.com" + "url": "https://translate-fips.us-isob-east-1.sc2s.sgov.gov" } }, "params": { + "Region": "us-isob-east-1", "UseFIPS": true, - "UseDualStack": false, - "Region": "us-east-1" + "UseDualStack": false } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled", "expect": { - "endpoint": { - "url": "https://translate.us-east-1.api.aws" - } + "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { + "Region": "us-isob-east-1", "UseFIPS": false, - "UseDualStack": true, - "Region": "us-east-1" + "UseDualStack": true } }, { - "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", "expect": { "endpoint": { - "url": "https://translate.us-east-1.amazonaws.com" + "url": "https://translate.us-isob-east-1.sc2s.sgov.gov" } }, "params": { + "Region": "us-isob-east-1", "UseFIPS": false, - "UseDualStack": false, - "Region": "us-east-1" + "UseDualStack": false } }, { - "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "documentation": "For custom endpoint with region set and fips disabled and dualstack disabled", "expect": { "endpoint": { - "url": "https://translate-fips.us-east-2.api.aws" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": true, - "Region": "us-east-2" - } - }, - { - "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://translate-fips.us-east-2.amazonaws.com" - } - }, - "params": { - "UseFIPS": true, - "UseDualStack": false, - "Region": "us-east-2" - } - }, - { - "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", - "expect": { - "endpoint": { - "url": "https://translate.us-east-2.api.aws" - } - }, - "params": { - "UseFIPS": false, - "UseDualStack": true, - "Region": "us-east-2" - } - }, - { - "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", - "expect": { - "endpoint": { - "url": "https://translate.us-east-2.amazonaws.com" + "url": "https://example.com" } }, "params": { + "Region": "us-east-1", "UseFIPS": false, "UseDualStack": false, - "Region": "us-east-2" + "Endpoint": "https://example.com" } }, { - "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "documentation": "For custom endpoint with region not set and fips disabled and dualstack disabled", "expect": { "endpoint": { "url": "https://example.com" @@ -942,7 +523,6 @@ "params": { "UseFIPS": false, "UseDualStack": false, - "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -952,9 +532,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { + "Region": "us-east-1", "UseFIPS": true, "UseDualStack": false, - "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -964,11 +544,17 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { + "Region": "us-east-1", "UseFIPS": false, "UseDualStack": true, - "Region": "us-east-1", "Endpoint": "https://example.com" } + }, + { + "documentation": "Missing region", + "expect": { + "error": "Invalid Configuration: Missing Region" + } } ], "version": "1.0" diff --git a/models/endpoints/endpoints.json b/models/endpoints/endpoints.json index 0495426d291..aadfabf9579 100644 --- a/models/endpoints/endpoints.json +++ b/models/endpoints/endpoints.json @@ -7956,11 +7956,6 @@ } }, "iot" : { - "defaults" : { - "credentialScope" : { - "service" : "execute-api" - } - }, "endpoints" : { "ap-east-1" : { }, "ap-northeast-1" : { }, @@ -7980,37 +7975,22 @@ "eu-west-2" : { }, "eu-west-3" : { }, "fips-ca-central-1" : { - "credentialScope" : { - "service" : "execute-api" - }, "deprecated" : true, "hostname" : "iot-fips.ca-central-1.amazonaws.com" }, "fips-us-east-1" : { - "credentialScope" : { - "service" : "execute-api" - }, "deprecated" : true, "hostname" : "iot-fips.us-east-1.amazonaws.com" }, "fips-us-east-2" : { - "credentialScope" : { - "service" : "execute-api" - }, "deprecated" : true, "hostname" : "iot-fips.us-east-2.amazonaws.com" }, "fips-us-west-1" : { - "credentialScope" : { - "service" : "execute-api" - }, "deprecated" : true, "hostname" : "iot-fips.us-west-1.amazonaws.com" }, "fips-us-west-2" : { - "credentialScope" : { - "service" : "execute-api" - }, "deprecated" : true, "hostname" : "iot-fips.us-west-2.amazonaws.com" }, @@ -10302,6 +10282,25 @@ "us-west-2" : { } } }, + "mediapackagev2" : { + "endpoints" : { + "ap-northeast-1" : { }, + "ap-northeast-2" : { }, + "ap-south-1" : { }, + "ap-southeast-1" : { }, + "ap-southeast-2" : { }, + "eu-central-1" : { }, + "eu-north-1" : { }, + "eu-west-1" : { }, + "eu-west-2" : { }, + "eu-west-3" : { }, + "sa-east-1" : { }, + "us-east-1" : { }, + "us-east-2" : { }, + "us-west-1" : { }, + "us-west-2" : { } + } + }, "mediastore" : { "endpoints" : { "ap-northeast-1" : { }, @@ -13042,6 +13041,7 @@ "ap-southeast-1" : { }, "ap-southeast-2" : { }, "ap-southeast-3" : { }, + "ap-southeast-4" : { }, "ca-central-1" : { }, "eu-central-1" : { }, "eu-central-2" : { }, @@ -18235,11 +18235,6 @@ } }, "iot" : { - "defaults" : { - "credentialScope" : { - "service" : "execute-api" - } - }, "endpoints" : { "cn-north-1" : { }, "cn-northwest-1" : { } @@ -21029,23 +21024,12 @@ } }, "iot" : { - "defaults" : { - "credentialScope" : { - "service" : "execute-api" - } - }, "endpoints" : { "fips-us-gov-east-1" : { - "credentialScope" : { - "service" : "execute-api" - }, "deprecated" : true, "hostname" : "iot-fips.us-gov-east-1.amazonaws.com" }, "fips-us-gov-west-1" : { - "credentialScope" : { - "service" : "execute-api" - }, "deprecated" : true, "hostname" : "iot-fips.us-gov-west-1.amazonaws.com" }, diff --git a/service/fms/api.go b/service/fms/api.go index dc20ad0d8eb..720e6610ac4 100644 --- a/service/fms/api.go +++ b/service/fms/api.go @@ -1250,6 +1250,12 @@ func (c *FMS) GetAdminScopeRequest(input *GetAdminScopeInput) (req *request.Requ // The operation failed because of a system problem, even though the request // was valid. Retry your request. // +// - LimitExceededException +// The operation exceeds a resource limit, for example, the maximum number of +// policy objects that you can create for an Amazon Web Services account. For +// more information, see Firewall Manager Limits (https://docs.aws.amazon.com/waf/latest/developerguide/fms-limits.html) +// in the WAF Developer Guide. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/fms-2018-01-01/GetAdminScope func (c *FMS) GetAdminScope(input *GetAdminScopeInput) (*GetAdminScopeOutput, error) { req, out := c.GetAdminScopeRequest(input) @@ -2195,6 +2201,12 @@ func (c *FMS) ListAdminAccountsForOrganizationRequest(input *ListAdminAccountsFo // The operation failed because of a system problem, even though the request // was valid. Retry your request. // +// - LimitExceededException +// The operation exceeds a resource limit, for example, the maximum number of +// policy objects that you can create for an Amazon Web Services account. For +// more information, see Firewall Manager Limits (https://docs.aws.amazon.com/waf/latest/developerguide/fms-limits.html) +// in the WAF Developer Guide. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/fms-2018-01-01/ListAdminAccountsForOrganization func (c *FMS) ListAdminAccountsForOrganization(input *ListAdminAccountsForOrganizationInput) (*ListAdminAccountsForOrganizationOutput, error) { req, out := c.ListAdminAccountsForOrganizationRequest(input) diff --git a/service/sagemaker/api.go b/service/sagemaker/api.go index 55ecb22db8d..4ca2e2843c9 100644 --- a/service/sagemaker/api.go +++ b/service/sagemaker/api.go @@ -45111,6 +45111,9 @@ type CreateTrainingJobInput struct { // container, or makes it available as input streams. For example, if you specify // an EFS location, input data files are available as input streams. They do // not need to be downloaded. + // + // Your input must be in the same Amazon Web Services region as your training + // job. InputDataConfig []*Channel `min:"1" type:"list"` // Specifies the path to the S3 location where you want to store model artifacts. @@ -73369,6 +73372,12 @@ type InferenceRecommendation struct { // EndpointConfiguration is a required field EndpointConfiguration *EndpointOutputConfiguration `type:"structure" required:"true"` + // A timestamp that shows when the benchmark completed. + InvocationEndTime *time.Time `type:"timestamp"` + + // A timestamp that shows when the benchmark started. + InvocationStartTime *time.Time `type:"timestamp"` + // The metrics used to decide what recommendation to make. // // Metrics is a required field @@ -73407,6 +73416,18 @@ func (s *InferenceRecommendation) SetEndpointConfiguration(v *EndpointOutputConf return s } +// SetInvocationEndTime sets the InvocationEndTime field's value. +func (s *InferenceRecommendation) SetInvocationEndTime(v time.Time) *InferenceRecommendation { + s.InvocationEndTime = &v + return s +} + +// SetInvocationStartTime sets the InvocationStartTime field's value. +func (s *InferenceRecommendation) SetInvocationStartTime(v time.Time) *InferenceRecommendation { + s.InvocationStartTime = &v + return s +} + // SetMetrics sets the Metrics field's value. func (s *InferenceRecommendation) SetMetrics(v *RecommendationMetrics) *InferenceRecommendation { s.Metrics = v @@ -73465,12 +73486,23 @@ type InferenceRecommendationsJob struct { // LastModifiedTime is a required field LastModifiedTime *time.Time `type:"timestamp" required:"true"` + // The name of the created model. + ModelName *string `type:"string"` + + // The Amazon Resource Name (ARN) of a versioned model package. + ModelPackageVersionArn *string `min:"1" type:"string"` + // The Amazon Resource Name (ARN) of an IAM role that enables Amazon SageMaker // to perform tasks on your behalf. // // RoleArn is a required field RoleArn *string `min:"20" type:"string" required:"true"` + // The Amazon Simple Storage Service (Amazon S3) path where the sample payload + // is stored. This path must point to a single gzip compressed tar archive (.tar.gz + // suffix). + SamplePayloadUrl *string `type:"string"` + // The status of the job. // // Status is a required field @@ -73543,12 +73575,30 @@ func (s *InferenceRecommendationsJob) SetLastModifiedTime(v time.Time) *Inferenc return s } +// SetModelName sets the ModelName field's value. +func (s *InferenceRecommendationsJob) SetModelName(v string) *InferenceRecommendationsJob { + s.ModelName = &v + return s +} + +// SetModelPackageVersionArn sets the ModelPackageVersionArn field's value. +func (s *InferenceRecommendationsJob) SetModelPackageVersionArn(v string) *InferenceRecommendationsJob { + s.ModelPackageVersionArn = &v + return s +} + // SetRoleArn sets the RoleArn field's value. func (s *InferenceRecommendationsJob) SetRoleArn(v string) *InferenceRecommendationsJob { s.RoleArn = &v return s } +// SetSamplePayloadUrl sets the SamplePayloadUrl field's value. +func (s *InferenceRecommendationsJob) SetSamplePayloadUrl(v string) *InferenceRecommendationsJob { + s.SamplePayloadUrl = &v + return s +} + // SetStatus sets the Status field's value. func (s *InferenceRecommendationsJob) SetStatus(v string) *InferenceRecommendationsJob { s.Status = &v @@ -80654,6 +80704,13 @@ type ListInferenceRecommendationsJobsInput struct { // The maximum number of recommendations to return in the response. MaxResults *int64 `min:"1" type:"integer"` + // A filter that returns only jobs that were created for this model. + ModelNameEquals *string `type:"string"` + + // A filter that returns only jobs that were created for this versioned model + // package. + ModelPackageVersionArnEquals *string `min:"1" type:"string"` + // A string in the job name. This filter returns only recommendations whose // name contains the specified string. NameContains *string `type:"string"` @@ -80698,6 +80755,9 @@ func (s *ListInferenceRecommendationsJobsInput) Validate() error { if s.MaxResults != nil && *s.MaxResults < 1 { invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) } + if s.ModelPackageVersionArnEquals != nil && len(*s.ModelPackageVersionArnEquals) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ModelPackageVersionArnEquals", 1)) + } if invalidParams.Len() > 0 { return invalidParams @@ -80735,6 +80795,18 @@ func (s *ListInferenceRecommendationsJobsInput) SetMaxResults(v int64) *ListInfe return s } +// SetModelNameEquals sets the ModelNameEquals field's value. +func (s *ListInferenceRecommendationsJobsInput) SetModelNameEquals(v string) *ListInferenceRecommendationsJobsInput { + s.ModelNameEquals = &v + return s +} + +// SetModelPackageVersionArnEquals sets the ModelPackageVersionArnEquals field's value. +func (s *ListInferenceRecommendationsJobsInput) SetModelPackageVersionArnEquals(v string) *ListInferenceRecommendationsJobsInput { + s.ModelPackageVersionArnEquals = &v + return s +} + // SetNameContains sets the NameContains field's value. func (s *ListInferenceRecommendationsJobsInput) SetNameContains(v string) *ListInferenceRecommendationsJobsInput { s.NameContains = &v @@ -99367,6 +99439,12 @@ type RecommendationJobInferenceBenchmark struct { // The reason why a benchmark failed. FailureReason *string `type:"string"` + // A timestamp that shows when the benchmark completed. + InvocationEndTime *time.Time `type:"timestamp"` + + // A timestamp that shows when the benchmark started. + InvocationStartTime *time.Time `type:"timestamp"` + // The metrics of recommendations. Metrics *RecommendationMetrics `type:"structure"` @@ -99413,6 +99491,18 @@ func (s *RecommendationJobInferenceBenchmark) SetFailureReason(v string) *Recomm return s } +// SetInvocationEndTime sets the InvocationEndTime field's value. +func (s *RecommendationJobInferenceBenchmark) SetInvocationEndTime(v time.Time) *RecommendationJobInferenceBenchmark { + s.InvocationEndTime = &v + return s +} + +// SetInvocationStartTime sets the InvocationStartTime field's value. +func (s *RecommendationJobInferenceBenchmark) SetInvocationStartTime(v time.Time) *RecommendationJobInferenceBenchmark { + s.InvocationStartTime = &v + return s +} + // SetMetrics sets the Metrics field's value. func (s *RecommendationJobInferenceBenchmark) SetMetrics(v *RecommendationMetrics) *RecommendationJobInferenceBenchmark { s.Metrics = v @@ -101412,6 +101502,9 @@ func (s *RetryStrategy) SetMaximumRetryAttempts(v int64) *RetryStrategy { } // Describes the S3 data source. +// +// Your input bucket must be in the same Amazon Web Services region as your +// training job. type S3DataSource struct { _ struct{} `type:"structure"` @@ -101477,6 +101570,9 @@ type S3DataSource struct { // for this data source. The object that each S3Uri points to must be readable // by the IAM role that SageMaker uses to perform tasks on your behalf. // + // Your input bucket must be located in same Amazon Web Services region as your + // training job. + // // S3Uri is a required field S3Uri *string `type:"string" required:"true"` } @@ -103004,8 +103100,8 @@ type SourceAlgorithm struct { // are stored. This path must point to a single gzip compressed tar archive // (.tar.gz suffix). // - // The model artifacts must be in an S3 bucket that is in the same region as - // the algorithm. + // The model artifacts must be in an S3 bucket that is in the same Amazon Web + // Services region as the algorithm. ModelDataUrl *string `type:"string"` } @@ -105855,6 +105951,9 @@ type TrainingJob struct { HyperParameters map[string]*string `type:"map"` // An array of Channel objects that describes each data input channel. + // + // Your input must be in the same Amazon Web Services region as your training + // job. InputDataConfig []*Channel `min:"1" type:"list"` // The Amazon Resource Name (ARN) of the labeling job. diff --git a/service/translate/api.go b/service/translate/api.go index a5f9688c41f..88ed4ba698b 100644 --- a/service/translate/api.go +++ b/service/translate/api.go @@ -1429,8 +1429,8 @@ func (c *Translate) StartTextTranslationJobRequest(input *StartTextTranslationJo // // - UnsupportedLanguagePairException // Amazon Translate does not support translation from the language of the source -// text into the requested target language. For more information, see Error -// messages (https://docs.aws.amazon.com/translate/latest/dg/how-to-error-msg.html). +// text into the requested target language. For more information, see Supported +// languages (https://docs.aws.amazon.com/translate/latest/dg/what-is-languages.html). // // - InvalidRequestException // The request that you made is not valid. Check your request to determine why @@ -1735,8 +1735,8 @@ func (c *Translate) TextRequest(input *TextInput) (req *request.Request, output // // - UnsupportedLanguagePairException // Amazon Translate does not support translation from the language of the source -// text into the requested target language. For more information, see Error -// messages (https://docs.aws.amazon.com/translate/latest/dg/how-to-error-msg.html). +// text into the requested target language. For more information, see Supported +// languages (https://docs.aws.amazon.com/translate/latest/dg/what-is-languages.html). // // - DetectedLanguageLowConfidenceException // The confidence that Amazon Comprehend accurately detected the source language @@ -1779,6 +1779,121 @@ func (c *Translate) TextWithContext(ctx aws.Context, input *TextInput, opts ...r return out, req.Send() } +const opTranslateDocument = "TranslateDocument" + +// TranslateDocumentRequest generates a "aws/request.Request" representing the +// client's request for the TranslateDocument 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 TranslateDocument for more information on using the TranslateDocument +// 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 TranslateDocumentRequest method. +// req, resp := client.TranslateDocumentRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/translate-2017-07-01/TranslateDocument +func (c *Translate) TranslateDocumentRequest(input *TranslateDocumentInput) (req *request.Request, output *TranslateDocumentOutput) { + op := &request.Operation{ + Name: opTranslateDocument, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &TranslateDocumentInput{} + } + + output = &TranslateDocumentOutput{} + req = c.newRequest(op, input, output) + return +} + +// TranslateDocument API operation for Amazon Translate. +// +// Translates the input document from the source language to the target language. +// This synchronous operation supports plain text or HTML for the input document. +// TranslateDocument supports translations from English to any supported language, +// and from any supported language to English. Therefore, specify either the +// source language code or the target language code as “en” (English). +// +// TranslateDocument does not support language auto-detection. +// +// If you set the Formality parameter, the request will fail if the target language +// does not support formality. For a list of target languages that support formality, +// see Setting formality (https://docs.aws.amazon.com/translate/latest/dg/customizing-translations-formality.html). +// +// 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 Translate's +// API operation TranslateDocument for usage and error information. +// +// Returned Error Types: +// +// - InvalidRequestException +// The request that you made is not valid. Check your request to determine why +// it's not valid and then retry the request. +// +// - LimitExceededException +// The specified limit has been exceeded. Review your request and retry it with +// a quantity below the stated limit. +// +// - TooManyRequestsException +// You have made too many requests within a short period of time. Wait for a +// short time and then try your request again. +// +// - ResourceNotFoundException +// The resource you are looking for has not been found. Review the resource +// you're looking for and see if a different resource will accomplish your needs +// before retrying the revised request. +// +// - UnsupportedLanguagePairException +// Amazon Translate does not support translation from the language of the source +// text into the requested target language. For more information, see Supported +// languages (https://docs.aws.amazon.com/translate/latest/dg/what-is-languages.html). +// +// - InternalServerException +// An internal server error occurred. Retry your request. +// +// - ServiceUnavailableException +// The Amazon Translate service is temporarily unavailable. Wait a bit and then +// retry your request. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/translate-2017-07-01/TranslateDocument +func (c *Translate) TranslateDocument(input *TranslateDocumentInput) (*TranslateDocumentOutput, error) { + req, out := c.TranslateDocumentRequest(input) + return out, req.Send() +} + +// TranslateDocumentWithContext is the same as TranslateDocument with the addition of +// the ability to pass a context and additional request options. +// +// See TranslateDocument 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 *Translate) TranslateDocumentWithContext(ctx aws.Context, input *TranslateDocumentInput, opts ...request.Option) (*TranslateDocumentOutput, error) { + req, out := c.TranslateDocumentRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opUntagResource = "UntagResource" // UntagResourceRequest generates a "aws/request.Request" representing the @@ -2638,6 +2753,82 @@ func (s *DetectedLanguageLowConfidenceException) RequestID() string { return s.RespMetadata.RequestID } +// The content and content type of a document. +type Document struct { + _ struct{} `type:"structure"` + + // The Contentfield type is Binary large object (blob). This object contains + // the document content converted into base64-encoded binary data. If you use + // one of the AWS SDKs, the SDK performs the Base64-encoding on this field before + // sending the request. + // + // Content is a sensitive parameter and its value will be + // replaced with "sensitive" in string returned by Document's + // String and GoString methods. + // + // Content is automatically base64 encoded/decoded by the SDK. + // + // Content is a required field + Content []byte `type:"blob" required:"true" sensitive:"true"` + + // Describes the format of the document. You can specify one of the following: + // + // * text/html - The input data consists of HTML content. Amazon Translate + // translates only the text in the HTML element. + // + // * text/plain - The input data consists of unformatted text. Amazon Translate + // translates every character in the content. + // + // ContentType is a required field + ContentType *string `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 Document) 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 Document) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *Document) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "Document"} + if s.Content == nil { + invalidParams.Add(request.NewErrParamRequired("Content")) + } + if s.ContentType == nil { + invalidParams.Add(request.NewErrParamRequired("ContentType")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetContent sets the Content field's value. +func (s *Document) SetContent(v []byte) *Document { + s.Content = v + return s +} + +// SetContentType sets the ContentType field's value. +func (s *Document) SetContentType(v string) *Document { + s.ContentType = &v + return s +} + // The encryption key used to encrypt this object. type EncryptionKey struct { _ struct{} `type:"structure"` @@ -5534,9 +5725,8 @@ type TextInput struct { // and phrases. Settings *TranslationSettings `type:"structure"` - // The language code for the language of the source text. The language must - // be a language supported by Amazon Translate. For a list of language codes, - // see Supported languages (https://docs.aws.amazon.com/translate/latest/dg/what-is-languages.html). + // The language code for the language of the source text. For a list of language + // codes, see Supported languages (https://docs.aws.amazon.com/translate/latest/dg/what-is-languages.html). // // To have Amazon Translate determine the source language of your text, you // can specify auto in the SourceLanguageCode field. If you specify auto, Amazon @@ -5550,15 +5740,21 @@ type TextInput struct { // SourceLanguageCode is a required field SourceLanguageCode *string `min:"2" type:"string" required:"true"` - // The language code requested for the language of the target text. The language - // must be a language supported by Amazon Translate. + // The language code requested for the language of the target text. For a list + // of language codes, see Supported languages (https://docs.aws.amazon.com/translate/latest/dg/what-is-languages.html). // // TargetLanguageCode is a required field TargetLanguageCode *string `min:"2" type:"string" required:"true"` - // The name of the terminology list file to be used in the TranslateText request. - // You can use 1 terminology list at most in a TranslateText request. Terminology - // lists can contain a maximum of 256 terms. + // The name of a terminology list file to add to the translation job. This file + // provides source terms and the desired translation for each term. A terminology + // list can contain a maximum of 256 terms. You can use one custom terminology + // resource in your translation request. + // + // Use the ListTerminologies operation to get the available terminology lists. + // + // For more information about custom terminology lists, see Custom terminology + // (https://docs.aws.amazon.com/translate/latest/dg/how-custom-terminology.html). TerminologyNames []*string `type:"list"` // The text to translate. The text string can be a maximum of 10,000 bytes long. @@ -5647,7 +5843,7 @@ func (s *TextInput) SetText(v string) *TextInput { type TextOutput struct { _ struct{} `type:"structure"` - // Settings that configure the translation output. + // Optional settings that modify the translation output. AppliedSettings *TranslationSettings `type:"structure"` // The names of the custom terminologies applied to the input text by Amazon @@ -5899,7 +6095,7 @@ type TextTranslationJobProperties struct { // translation job. ParallelDataNames []*string `type:"list"` - // Settings that configure the translation output. + // Settings that modify the translation output. Settings *TranslationSettings `type:"structure"` // The language code of the language of the source text. The language must be @@ -6158,8 +6354,243 @@ func (s *TooManyTagsException) RequestID() string { return s.RespMetadata.RequestID } -// Optional settings that configure the translation output. Use these settings -// for real time translations and asynchronous translation jobs. +type TranslateDocumentInput struct { + _ struct{} `type:"structure"` + + // The content and content type for the document to be translated. The document + // size must not exceed 100 KB. + // + // Document is a required field + Document *Document `type:"structure" required:"true"` + + // Settings to configure your translation output, including the option to set + // the formality level of the output text and the option to mask profane words + // and phrases. + Settings *TranslationSettings `type:"structure"` + + // The language code for the language of the source text. Do not use auto, because + // TranslateDocument does not support language auto-detection. For a list of + // supported language codes, see Supported languages (https://docs.aws.amazon.com/translate/latest/dg/what-is-languages.html). + // + // SourceLanguageCode is a required field + SourceLanguageCode *string `min:"2" type:"string" required:"true"` + + // The language code requested for the translated document. For a list of supported + // language codes, see Supported languages (https://docs.aws.amazon.com/translate/latest/dg/what-is-languages.html). + // + // TargetLanguageCode is a required field + TargetLanguageCode *string `min:"2" type:"string" required:"true"` + + // The name of a terminology list file to add to the translation job. This file + // provides source terms and the desired translation for each term. A terminology + // list can contain a maximum of 256 terms. You can use one custom terminology + // resource in your translation request. + // + // Use the ListTerminologies operation to get the available terminology lists. + // + // For more information about custom terminology lists, see Custom terminology + // (https://docs.aws.amazon.com/translate/latest/dg/how-custom-terminology.html). + TerminologyNames []*string `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 TranslateDocumentInput) 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 TranslateDocumentInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *TranslateDocumentInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "TranslateDocumentInput"} + if s.Document == nil { + invalidParams.Add(request.NewErrParamRequired("Document")) + } + if s.SourceLanguageCode == nil { + invalidParams.Add(request.NewErrParamRequired("SourceLanguageCode")) + } + if s.SourceLanguageCode != nil && len(*s.SourceLanguageCode) < 2 { + invalidParams.Add(request.NewErrParamMinLen("SourceLanguageCode", 2)) + } + if s.TargetLanguageCode == nil { + invalidParams.Add(request.NewErrParamRequired("TargetLanguageCode")) + } + if s.TargetLanguageCode != nil && len(*s.TargetLanguageCode) < 2 { + invalidParams.Add(request.NewErrParamMinLen("TargetLanguageCode", 2)) + } + if s.Document != nil { + if err := s.Document.Validate(); err != nil { + invalidParams.AddNested("Document", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDocument sets the Document field's value. +func (s *TranslateDocumentInput) SetDocument(v *Document) *TranslateDocumentInput { + s.Document = v + return s +} + +// SetSettings sets the Settings field's value. +func (s *TranslateDocumentInput) SetSettings(v *TranslationSettings) *TranslateDocumentInput { + s.Settings = v + return s +} + +// SetSourceLanguageCode sets the SourceLanguageCode field's value. +func (s *TranslateDocumentInput) SetSourceLanguageCode(v string) *TranslateDocumentInput { + s.SourceLanguageCode = &v + return s +} + +// SetTargetLanguageCode sets the TargetLanguageCode field's value. +func (s *TranslateDocumentInput) SetTargetLanguageCode(v string) *TranslateDocumentInput { + s.TargetLanguageCode = &v + return s +} + +// SetTerminologyNames sets the TerminologyNames field's value. +func (s *TranslateDocumentInput) SetTerminologyNames(v []*string) *TranslateDocumentInput { + s.TerminologyNames = v + return s +} + +type TranslateDocumentOutput struct { + _ struct{} `type:"structure"` + + // Settings to configure your translation output, including the option to set + // the formality level of the output text and the option to mask profane words + // and phrases. + AppliedSettings *TranslationSettings `type:"structure"` + + // The names of the custom terminologies applied to the input text by Amazon + // Translate to produce the translated text document. + AppliedTerminologies []*AppliedTerminology `type:"list"` + + // The language code of the source document. + // + // SourceLanguageCode is a required field + SourceLanguageCode *string `min:"2" type:"string" required:"true"` + + // The language code of the translated document. + // + // TargetLanguageCode is a required field + TargetLanguageCode *string `min:"2" type:"string" required:"true"` + + // The document containing the translated content. The document format matches + // the source document format. + // + // TranslatedDocument is a required field + TranslatedDocument *TranslatedDocument `type:"structure" 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 TranslateDocumentOutput) 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 TranslateDocumentOutput) GoString() string { + return s.String() +} + +// SetAppliedSettings sets the AppliedSettings field's value. +func (s *TranslateDocumentOutput) SetAppliedSettings(v *TranslationSettings) *TranslateDocumentOutput { + s.AppliedSettings = v + return s +} + +// SetAppliedTerminologies sets the AppliedTerminologies field's value. +func (s *TranslateDocumentOutput) SetAppliedTerminologies(v []*AppliedTerminology) *TranslateDocumentOutput { + s.AppliedTerminologies = v + return s +} + +// SetSourceLanguageCode sets the SourceLanguageCode field's value. +func (s *TranslateDocumentOutput) SetSourceLanguageCode(v string) *TranslateDocumentOutput { + s.SourceLanguageCode = &v + return s +} + +// SetTargetLanguageCode sets the TargetLanguageCode field's value. +func (s *TranslateDocumentOutput) SetTargetLanguageCode(v string) *TranslateDocumentOutput { + s.TargetLanguageCode = &v + return s +} + +// SetTranslatedDocument sets the TranslatedDocument field's value. +func (s *TranslateDocumentOutput) SetTranslatedDocument(v *TranslatedDocument) *TranslateDocumentOutput { + s.TranslatedDocument = v + return s +} + +// The translated content. +type TranslatedDocument struct { + _ struct{} `type:"structure"` + + // The document containing the translated content. + // + // Content is a sensitive parameter and its value will be + // replaced with "sensitive" in string returned by TranslatedDocument's + // String and GoString methods. + // + // Content is automatically base64 encoded/decoded by the SDK. + // + // Content is a required field + Content []byte `type:"blob" required:"true" sensitive:"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 TranslatedDocument) 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 TranslatedDocument) GoString() string { + return s.String() +} + +// SetContent sets the Content field's value. +func (s *TranslatedDocument) SetContent(v []byte) *TranslatedDocument { + s.Content = v + return s +} + +// Settings to configure your translation output, including the option to set +// the formality level of the output text and the option to mask profane words +// and phrases. type TranslationSettings struct { _ struct{} `type:"structure"` @@ -6295,8 +6726,8 @@ func (s *UnsupportedDisplayLanguageCodeException) RequestID() string { } // Amazon Translate does not support translation from the language of the source -// text into the requested target language. For more information, see Error -// messages (https://docs.aws.amazon.com/translate/latest/dg/how-to-error-msg.html). +// text into the requested target language. For more information, see Supported +// languages (https://docs.aws.amazon.com/translate/latest/dg/what-is-languages.html). type UnsupportedLanguagePairException struct { _ struct{} `type:"structure"` RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` diff --git a/service/translate/errors.go b/service/translate/errors.go index 5275778c12f..bbc288d40ea 100644 --- a/service/translate/errors.go +++ b/service/translate/errors.go @@ -110,8 +110,8 @@ const ( // "UnsupportedLanguagePairException". // // Amazon Translate does not support translation from the language of the source - // text into the requested target language. For more information, see Error - // messages (https://docs.aws.amazon.com/translate/latest/dg/how-to-error-msg.html). + // text into the requested target language. For more information, see Supported + // languages (https://docs.aws.amazon.com/translate/latest/dg/what-is-languages.html). ErrCodeUnsupportedLanguagePairException = "UnsupportedLanguagePairException" ) diff --git a/service/translate/translateiface/interface.go b/service/translate/translateiface/interface.go index e0cb4e79808..55254c8af09 100644 --- a/service/translate/translateiface/interface.go +++ b/service/translate/translateiface/interface.go @@ -136,6 +136,10 @@ type TranslateAPI interface { TextWithContext(aws.Context, *translate.TextInput, ...request.Option) (*translate.TextOutput, error) TextRequest(*translate.TextInput) (*request.Request, *translate.TextOutput) + TranslateDocument(*translate.TranslateDocumentInput) (*translate.TranslateDocumentOutput, error) + TranslateDocumentWithContext(aws.Context, *translate.TranslateDocumentInput, ...request.Option) (*translate.TranslateDocumentOutput, error) + TranslateDocumentRequest(*translate.TranslateDocumentInput) (*request.Request, *translate.TranslateDocumentOutput) + UntagResource(*translate.UntagResourceInput) (*translate.UntagResourceOutput, error) UntagResourceWithContext(aws.Context, *translate.UntagResourceInput, ...request.Option) (*translate.UntagResourceOutput, error) UntagResourceRequest(*translate.UntagResourceInput) (*request.Request, *translate.UntagResourceOutput)