diff --git a/.all-contributorsrc b/.all-contributorsrc index 370d7a7d7a81..85a96b9e095c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -985,6 +985,15 @@ "contributions": [ "doc" ] + }, + { + "login": "chaykin", + "name": "Kirill Chaykin", + "avatar_url": "https://avatars.githubusercontent.com/u/2480265?v=4", + "profile": "https://github.com/chaykin", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/.changes/2.25.67.json b/.changes/2.25.67.json new file mode 100644 index 000000000000..0ff32c8d9dc7 --- /dev/null +++ b/.changes/2.25.67.json @@ -0,0 +1,30 @@ +{ + "version": "2.25.67", + "date": "2024-06-05", + "entries": [ + { + "type": "feature", + "category": "AWS Global Accelerator", + "contributor": "", + "description": "This release contains a new optional ip-addresses input field for the update accelerator and update custom routing accelerator apis. This input enables consumers to replace IPv4 addresses on existing accelerators with addresses provided in the input." + }, + { + "type": "feature", + "category": "AWS Glue", + "contributor": "", + "description": "AWS Glue now supports native SaaS connectivity: Salesforce connector available now" + }, + { + "type": "feature", + "category": "Amazon Simple Storage Service", + "contributor": "", + "description": "Added new params copySource and key to copyObject API for supporting S3 Access Grants plugin. These changes will not change any of the existing S3 API functionality." + }, + { + "type": "feature", + "category": "AWS SDK for Java v2", + "contributor": "", + "description": "Updated endpoint and partition metadata." + } + ] +} \ No newline at end of file diff --git a/.changes/2.25.68.json b/.changes/2.25.68.json new file mode 100644 index 000000000000..72b369cdd1ab --- /dev/null +++ b/.changes/2.25.68.json @@ -0,0 +1,66 @@ +{ + "version": "2.25.68", + "date": "2024-06-06", + "entries": [ + { + "type": "feature", + "category": "AWS Account", + "contributor": "", + "description": "This release adds 3 new APIs (AcceptPrimaryEmailUpdate, GetPrimaryEmail, and StartPrimaryEmailUpdate) used to centrally manage the root user email address of member accounts within an AWS organization." + }, + { + "type": "feature", + "category": "AWS Glue", + "contributor": "", + "description": "This release adds support for creating and updating Glue Data Catalog Views." + }, + { + "type": "feature", + "category": "AWS IoT Wireless", + "contributor": "", + "description": "Adds support for wireless device to be in Conflict FUOTA Device Status due to a FUOTA Task, so it couldn't be attached to a new one." + }, + { + "type": "feature", + "category": "Amazon S3", + "contributor": "chaykin", + "description": "Allow user to configure content type for BlockingInputStreamAsyncRequestBody" + }, + { + "type": "feature", + "category": "AWS Storage Gateway", + "contributor": "", + "description": "Adds SoftwareUpdatePreferences to DescribeMaintenanceStartTime and UpdateMaintenanceStartTime, a structure which contains AutomaticUpdatePolicy." + }, + { + "type": "feature", + "category": "Amazon FSx", + "contributor": "", + "description": "This release adds support to increase metadata performance on FSx for Lustre file systems beyond the default level provisioned when a file system is created. This can be done by specifying MetadataConfiguration during the creation of Persistent_2 file systems or by updating it on demand." + }, + { + "type": "feature", + "category": "Amazon Kinesis Firehose", + "contributor": "", + "description": "Adds integration with Secrets Manager for Redshift, Splunk, HttpEndpoint, and Snowflake destinations" + }, + { + "type": "feature", + "category": "Amazon Location Service", + "contributor": "", + "description": "Added two new APIs, VerifyDevicePosition and ForecastGeofenceEvents. Added support for putting larger geofences up to 100,000 vertices with Geobuf fields." + }, + { + "type": "feature", + "category": "Amazon Simple Notification Service", + "contributor": "", + "description": "Doc-only update for SNS. These changes include customer-reported issues and TXC3 updates." + }, + { + "type": "feature", + "category": "Amazon Simple Queue Service", + "contributor": "", + "description": "Doc only updates for SQS. These updates include customer-reported issues and TCX3 modifications." + } + ] +} \ No newline at end of file diff --git a/.changes/2.25.69.json b/.changes/2.25.69.json new file mode 100644 index 000000000000..ff9806b9b90d --- /dev/null +++ b/.changes/2.25.69.json @@ -0,0 +1,42 @@ +{ + "version": "2.25.69", + "date": "2024-06-07", + "entries": [ + { + "type": "feature", + "category": "AWS Audit Manager", + "contributor": "", + "description": "New feature: common controls. When creating custom controls, you can now use pre-grouped AWS data sources based on common compliance themes. Also, the awsServices parameter is deprecated because we now manage services in scope for you. If used, the input is ignored and an empty list is returned." + }, + { + "type": "feature", + "category": "AWS B2B Data Interchange", + "contributor": "", + "description": "Added exceptions to B2Bi List operations and ConflictException to B2Bi StartTransformerJob operation. Also made capabilities field explicitly required when creating a Partnership." + }, + { + "type": "feature", + "category": "AWS CodePipeline", + "contributor": "", + "description": "CodePipeline now supports overriding S3 Source Object Key during StartPipelineExecution, as part of Source Overrides." + }, + { + "type": "feature", + "category": "Amazon SageMaker Service", + "contributor": "", + "description": "This release introduces a new optional parameter: InferenceAmiVersion, in ProductionVariant." + }, + { + "type": "feature", + "category": "Amazon Verified Permissions", + "contributor": "", + "description": "This release adds OpenIdConnect (OIDC) configuration support for IdentitySources, allowing for external IDPs to be used in authorization requests." + }, + { + "type": "feature", + "category": "AWS SDK for Java v2", + "contributor": "", + "description": "Updated endpoint and partition metadata." + } + ] +} \ No newline at end of file diff --git a/.changes/next-release/feature-AWSS3-2bfc0aa.json b/.changes/next-release/feature-AWSS3-2bfc0aa.json new file mode 100644 index 000000000000..c979bc0ff254 --- /dev/null +++ b/.changes/next-release/feature-AWSS3-2bfc0aa.json @@ -0,0 +1,6 @@ +{ + "type": "feature", + "category": "Amazon S3", + "contributor": "nikitamsawant", + "description": "Updated the version of aws-s3-accessgrants-java-plugin to include changes that support copyObject and deleteObjects." +} diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ad025b1fe17..6d05836ed35d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,92 @@ #### 👋 _Looking for changelogs for older versions? You can find them in the [changelogs](./changelogs) directory._ +# __2.25.69__ __2024-06-07__ +## __AWS Audit Manager__ + - ### Features + - New feature: common controls. When creating custom controls, you can now use pre-grouped AWS data sources based on common compliance themes. Also, the awsServices parameter is deprecated because we now manage services in scope for you. If used, the input is ignored and an empty list is returned. + +## __AWS B2B Data Interchange__ + - ### Features + - Added exceptions to B2Bi List operations and ConflictException to B2Bi StartTransformerJob operation. Also made capabilities field explicitly required when creating a Partnership. + +## __AWS CodePipeline__ + - ### Features + - CodePipeline now supports overriding S3 Source Object Key during StartPipelineExecution, as part of Source Overrides. + +## __AWS SDK for Java v2__ + - ### Features + - Updated endpoint and partition metadata. + +## __Amazon SageMaker Service__ + - ### Features + - This release introduces a new optional parameter: InferenceAmiVersion, in ProductionVariant. + +## __Amazon Verified Permissions__ + - ### Features + - This release adds OpenIdConnect (OIDC) configuration support for IdentitySources, allowing for external IDPs to be used in authorization requests. + +# __2.25.68__ __2024-06-06__ +## __AWS Account__ + - ### Features + - This release adds 3 new APIs (AcceptPrimaryEmailUpdate, GetPrimaryEmail, and StartPrimaryEmailUpdate) used to centrally manage the root user email address of member accounts within an AWS organization. + +## __AWS Glue__ + - ### Features + - This release adds support for creating and updating Glue Data Catalog Views. + +## __AWS IoT Wireless__ + - ### Features + - Adds support for wireless device to be in Conflict FUOTA Device Status due to a FUOTA Task, so it couldn't be attached to a new one. + +## __AWS Storage Gateway__ + - ### Features + - Adds SoftwareUpdatePreferences to DescribeMaintenanceStartTime and UpdateMaintenanceStartTime, a structure which contains AutomaticUpdatePolicy. + +## __Amazon FSx__ + - ### Features + - This release adds support to increase metadata performance on FSx for Lustre file systems beyond the default level provisioned when a file system is created. This can be done by specifying MetadataConfiguration during the creation of Persistent_2 file systems or by updating it on demand. + +## __Amazon Kinesis Firehose__ + - ### Features + - Adds integration with Secrets Manager for Redshift, Splunk, HttpEndpoint, and Snowflake destinations + +## __Amazon Location Service__ + - ### Features + - Added two new APIs, VerifyDevicePosition and ForecastGeofenceEvents. Added support for putting larger geofences up to 100,000 vertices with Geobuf fields. + +## __Amazon S3__ + - ### Features + - Allow user to configure content type for BlockingInputStreamAsyncRequestBody + - Contributed by: [@chaykin](https://github.com/chaykin) + +## __Amazon Simple Notification Service__ + - ### Features + - Doc-only update for SNS. These changes include customer-reported issues and TXC3 updates. + +## __Amazon Simple Queue Service__ + - ### Features + - Doc only updates for SQS. These updates include customer-reported issues and TCX3 modifications. + +## __Contributors__ +Special thanks to the following contributors to this release: + +[@chaykin](https://github.com/chaykin) +# __2.25.67__ __2024-06-05__ +## __AWS Global Accelerator__ + - ### Features + - This release contains a new optional ip-addresses input field for the update accelerator and update custom routing accelerator apis. This input enables consumers to replace IPv4 addresses on existing accelerators with addresses provided in the input. + +## __AWS Glue__ + - ### Features + - AWS Glue now supports native SaaS connectivity: Salesforce connector available now + +## __AWS SDK for Java v2__ + - ### Features + - Updated endpoint and partition metadata. + +## __Amazon Simple Storage Service__ + - ### Features + - Added new params copySource and key to copyObject API for supporting S3 Access Grants plugin. These changes will not change any of the existing S3 API functionality. + # __2.25.66__ __2024-06-04__ ## __AWS SDK for Java v2__ - ### Features diff --git a/README.md b/README.md index d75242f3f238..80ad7d3173a4 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [](https://gitter.im/aws/aws-sdk-java-v2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [](https://codecov.io/gh/aws/aws-sdk-java-v2) <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section --> -[](#contributors-) +[](#contributors-) <!-- ALL-CONTRIBUTORS-BADGE:END --> The **AWS SDK for Java 2.0** is a rewrite of 1.0 with some great new features. As with version 1.0, @@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>bom</artifactId> - <version>2.25.66</version> + <version>2.25.69</version> <type>pom</type> <scope>import</scope> </dependency> @@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only: <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>ec2</artifactId> - <version>2.25.66</version> + <version>2.25.69</version> </dependency> <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>s3</artifactId> - <version>2.25.66</version> + <version>2.25.69</version> </dependency> ``` @@ -103,7 +103,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please <dependency> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java</artifactId> - <version>2.25.66</version> + <version>2.25.69</version> </dependency> ``` @@ -331,6 +331,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d <td align="center" valign="top" width="14.28%"><a href="https://github.com/eckardnet"><img src="https://avatars.githubusercontent.com/u/13320705?v=4?s=100" width="100px;" alt="Eckard Mühlich"/><br /><sub><b>Eckard Mühlich</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=eckardnet" title="Code">💻</a></td> <td align="center" valign="top" width="14.28%"><a href="http://wicket.apache.org"><img src="https://avatars.githubusercontent.com/u/980773?v=4?s=100" width="100px;" alt="Tobias Soloschenko"/><br /><sub><b>Tobias Soloschenko</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=klopfdreh" title="Code">💻</a></td> <td align="center" valign="top" width="14.28%"><a href="https://github.com/Madrigal"><img src="https://avatars.githubusercontent.com/u/599908?v=4?s=100" width="100px;" alt="Luis Madrigal"/><br /><sub><b>Luis Madrigal</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=Madrigal" title="Documentation">📖</a></td> + <td align="center" valign="top" width="14.28%"><a href="https://github.com/chaykin"><img src="https://avatars.githubusercontent.com/u/2480265?v=4?s=100" width="100px;" alt="Kirill Chaykin"/><br /><sub><b>Kirill Chaykin</b></sub></a><br /><a href="https://github.com/aws/aws-sdk-java-v2/commits?author=chaykin" title="Code">💻</a></td> </tr> </tbody> </table> diff --git a/archetypes/archetype-app-quickstart/pom.xml b/archetypes/archetype-app-quickstart/pom.xml index 2ab00ee3b454..232f502714bb 100644 --- a/archetypes/archetype-app-quickstart/pom.xml +++ b/archetypes/archetype-app-quickstart/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>archetypes</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/archetypes/archetype-lambda/pom.xml b/archetypes/archetype-lambda/pom.xml index 841aa45ea54f..ad840f05f85e 100644 --- a/archetypes/archetype-lambda/pom.xml +++ b/archetypes/archetype-lambda/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>archetypes</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archetype-lambda</artifactId> diff --git a/archetypes/archetype-tools/pom.xml b/archetypes/archetype-tools/pom.xml index 22147f60efb5..98938f2cef49 100644 --- a/archetypes/archetype-tools/pom.xml +++ b/archetypes/archetype-tools/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>archetypes</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/archetypes/pom.xml b/archetypes/pom.xml index 7ce1265ff676..10860f682a1e 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>archetypes</artifactId> diff --git a/aws-sdk-java/pom.xml b/aws-sdk-java/pom.xml index 662ea41715b3..c454e3c0d406 100644 --- a/aws-sdk-java/pom.xml +++ b/aws-sdk-java/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>aws-sdk-java</artifactId> diff --git a/bom-internal/pom.xml b/bom-internal/pom.xml index a247cedc6cd6..69dd1c1cc73a 100644 --- a/bom-internal/pom.xml +++ b/bom-internal/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/bom/pom.xml b/bom/pom.xml index a654762e9199..211b7eedcbbc 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>bom</artifactId> diff --git a/bundle-logging-bridge/pom.xml b/bundle-logging-bridge/pom.xml index 7531f27271fa..32988ada6ece 100644 --- a/bundle-logging-bridge/pom.xml +++ b/bundle-logging-bridge/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>bundle-logging-bridge</artifactId> <packaging>jar</packaging> diff --git a/bundle-sdk/pom.xml b/bundle-sdk/pom.xml index 0e76ce514170..84de858c7e93 100644 --- a/bundle-sdk/pom.xml +++ b/bundle-sdk/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>bundle-sdk</artifactId> <packaging>jar</packaging> diff --git a/bundle/pom.xml b/bundle/pom.xml index 7b6a515d8c8b..d7944d1db93a 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>bundle</artifactId> <packaging>jar</packaging> diff --git a/codegen-lite-maven-plugin/pom.xml b/codegen-lite-maven-plugin/pom.xml index d1d09f61bc27..05224cd418d5 100644 --- a/codegen-lite-maven-plugin/pom.xml +++ b/codegen-lite-maven-plugin/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>codegen-lite-maven-plugin</artifactId> diff --git a/codegen-lite/pom.xml b/codegen-lite/pom.xml index 113b976f4f7a..47570f1f0c8f 100644 --- a/codegen-lite/pom.xml +++ b/codegen-lite/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>codegen-lite</artifactId> <name>AWS Java SDK :: Code Generator Lite</name> diff --git a/codegen-maven-plugin/pom.xml b/codegen-maven-plugin/pom.xml index 8ce886c20604..829b74e9c153 100644 --- a/codegen-maven-plugin/pom.xml +++ b/codegen-maven-plugin/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>codegen-maven-plugin</artifactId> diff --git a/codegen/pom.xml b/codegen/pom.xml index 1a1b13ff5e87..b1de70e73ecc 100644 --- a/codegen/pom.xml +++ b/codegen/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>codegen</artifactId> <name>AWS Java SDK :: Code Generator</name> diff --git a/core/annotations/pom.xml b/core/annotations/pom.xml index 97c93e1fd938..61a29e93c604 100644 --- a/core/annotations/pom.xml +++ b/core/annotations/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>core</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/core/arns/pom.xml b/core/arns/pom.xml index 46fafcfb9986..a65134078d9b 100644 --- a/core/arns/pom.xml +++ b/core/arns/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>core</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/core/auth-crt/pom.xml b/core/auth-crt/pom.xml index ead0c523ed47..0aa36601d6d9 100644 --- a/core/auth-crt/pom.xml +++ b/core/auth-crt/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>core</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>auth-crt</artifactId> diff --git a/core/auth-crt/src/main/java/software/amazon/awssdk/authcrt/signer/AwsCrtS3V4aSigner.java b/core/auth-crt/src/main/java/software/amazon/awssdk/authcrt/signer/AwsCrtS3V4aSigner.java index c6ee258c064e..794245dea8d9 100644 --- a/core/auth-crt/src/main/java/software/amazon/awssdk/authcrt/signer/AwsCrtS3V4aSigner.java +++ b/core/auth-crt/src/main/java/software/amazon/awssdk/authcrt/signer/AwsCrtS3V4aSigner.java @@ -38,10 +38,13 @@ * <p/> * See <a href="https://docs.aws.amazon.com/AmazonS3/latest/API/sig-v4-authenticating-requests.html"> * Amazon S3 Sigv4 documentation</a> for more detailed information. + * + * @deprecated Use {@code software.amazon.awssdk.http.auth.aws.signer.AwsV4aHttpSigner} from the 'http-auth-aws' module. */ @SdkPublicApi @Immutable @ThreadSafe +@Deprecated public interface AwsCrtS3V4aSigner extends Signer, Presigner { /** diff --git a/core/auth-crt/src/main/java/software/amazon/awssdk/authcrt/signer/AwsCrtV4aSigner.java b/core/auth-crt/src/main/java/software/amazon/awssdk/authcrt/signer/AwsCrtV4aSigner.java index 692ecec5047f..e43425d83db6 100644 --- a/core/auth-crt/src/main/java/software/amazon/awssdk/authcrt/signer/AwsCrtV4aSigner.java +++ b/core/auth-crt/src/main/java/software/amazon/awssdk/authcrt/signer/AwsCrtV4aSigner.java @@ -28,10 +28,13 @@ * (Common RunTime) library. * <p/> * In CRT signing, payload signing is the default unless an override value is specified. + * + * @deprecated Use {@code software.amazon.awssdk.http.auth.aws.signer.AwsV4aHttpSigner} from the 'http-auth-aws' module. */ @SdkPublicApi @Immutable @ThreadSafe +@Deprecated public interface AwsCrtV4aSigner extends Signer, Presigner { /** diff --git a/core/auth/pom.xml b/core/auth/pom.xml index 96b2d2ef7445..a2631e047da0 100644 --- a/core/auth/pom.xml +++ b/core/auth/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>core</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>auth</artifactId> diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AsyncAws4Signer.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AsyncAws4Signer.java index 5a175bcaf4b4..eb5a6b4339db 100644 --- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AsyncAws4Signer.java +++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AsyncAws4Signer.java @@ -34,7 +34,10 @@ /** * AWS Signature Version 4 signer that can include contents of an asynchronous request body into the signature * calculation. + * + * @deprecated Use {@code software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner} from the 'http-auth-aws' module. */ +@Deprecated @SdkPublicApi public final class AsyncAws4Signer extends BaseAws4Signer implements AsyncSigner { diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4Signer.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4Signer.java index bad5428c3a8c..7c37904ecfe1 100644 --- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4Signer.java +++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4Signer.java @@ -20,7 +20,10 @@ /** * Signer implementation that signs requests with the AWS4 signing protocol. + * + * @deprecated Use {@code software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner} from the 'http-auth-aws' module. */ +@Deprecated @SdkPublicApi public final class Aws4Signer extends BaseAws4Signer { diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4UnsignedPayloadSigner.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4UnsignedPayloadSigner.java index 5b49c694dc3a..9773d81d7645 100644 --- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4UnsignedPayloadSigner.java +++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/Aws4UnsignedPayloadSigner.java @@ -32,8 +32,11 @@ * <p> * Payloads are still signed for requests over HTTP to preserve the request * integrity over a non-secure transport. + * + * @deprecated Use {@code software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner} from the 'http-auth-aws' module. */ @SdkPublicApi +@Deprecated public final class Aws4UnsignedPayloadSigner extends BaseAws4Signer { public static final String UNSIGNED_PAYLOAD = "UNSIGNED-PAYLOAD"; diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AwsS3V4Signer.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AwsS3V4Signer.java index eb0a93c123f4..9df0b58b9302 100644 --- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AwsS3V4Signer.java +++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/AwsS3V4Signer.java @@ -20,7 +20,10 @@ /** * AWS4 signer implementation for AWS S3 + * + * @deprecated Use {@code software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner} from the 'http-auth-aws' module. */ +@Deprecated @SdkPublicApi public final class AwsS3V4Signer extends AbstractAwsS3V4Signer { private AwsS3V4Signer() { diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/EventStreamAws4Signer.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/EventStreamAws4Signer.java index 474046cf2202..8776f4b5dc0b 100644 --- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/EventStreamAws4Signer.java +++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/EventStreamAws4Signer.java @@ -18,6 +18,7 @@ import software.amazon.awssdk.annotations.SdkProtectedApi; import software.amazon.awssdk.auth.signer.internal.BaseEventStreamAsyncAws4Signer; +@Deprecated @SdkProtectedApi public final class EventStreamAws4Signer extends BaseEventStreamAsyncAws4Signer { private EventStreamAws4Signer() { diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/SignerLoader.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/SignerLoader.java index add5a3e83208..94781f69b90f 100644 --- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/SignerLoader.java +++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/SignerLoader.java @@ -26,6 +26,7 @@ /** * Utility class for instantiating signers only if they're available on the class path. */ +@Deprecated @SdkProtectedApi public final class SignerLoader { diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseAws4Signer.java b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseAws4Signer.java index 6ae237487578..08652ec79134 100644 --- a/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseAws4Signer.java +++ b/core/auth/src/main/java/software/amazon/awssdk/auth/signer/internal/BaseAws4Signer.java @@ -27,6 +27,7 @@ * Abstract base class for concrete implementations of Aws4 signers. */ @SdkInternalApi +@Deprecated public abstract class BaseAws4Signer extends AbstractAws4Signer<Aws4SignerParams, Aws4PresignerParams> { @Override diff --git a/core/auth/src/main/java/software/amazon/awssdk/auth/token/signer/aws/BearerTokenSigner.java b/core/auth/src/main/java/software/amazon/awssdk/auth/token/signer/aws/BearerTokenSigner.java index f150ac057fe1..9d8e6040ccdd 100644 --- a/core/auth/src/main/java/software/amazon/awssdk/auth/token/signer/aws/BearerTokenSigner.java +++ b/core/auth/src/main/java/software/amazon/awssdk/auth/token/signer/aws/BearerTokenSigner.java @@ -27,8 +27,11 @@ /** * A {@link Signer} that will sign a request with Bearer token authorization. + * + * @deprecated Use {@code software.amazon.awssdk.http.auth.signer.BearerHttpSigner} from the 'http-auth' module. */ @SdkPublicApi +@Deprecated public final class BearerTokenSigner implements Signer { private static final String BEARER_LABEL = "Bearer"; diff --git a/core/aws-core/pom.xml b/core/aws-core/pom.xml index 44092932f8e8..df518f05cbf0 100644 --- a/core/aws-core/pom.xml +++ b/core/aws-core/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>core</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>aws-core</artifactId> diff --git a/core/checksums-spi/pom.xml b/core/checksums-spi/pom.xml index f1f9084ab577..54694c944952 100644 --- a/core/checksums-spi/pom.xml +++ b/core/checksums-spi/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>core</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>checksums-spi</artifactId> diff --git a/core/checksums/pom.xml b/core/checksums/pom.xml index fedaddb02845..5e58dc76dfb6 100644 --- a/core/checksums/pom.xml +++ b/core/checksums/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>core</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>checksums</artifactId> diff --git a/core/crt-core/pom.xml b/core/crt-core/pom.xml index 738f66ca11d6..55ac806f2dad 100644 --- a/core/crt-core/pom.xml +++ b/core/crt-core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>core</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>crt-core</artifactId> diff --git a/core/endpoints-spi/pom.xml b/core/endpoints-spi/pom.xml index 092bfe58cd13..9bd21f6e663e 100644 --- a/core/endpoints-spi/pom.xml +++ b/core/endpoints-spi/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>core</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/core/http-auth-aws-crt/pom.xml b/core/http-auth-aws-crt/pom.xml index b3900e90b8a6..00371bb461f7 100644 --- a/core/http-auth-aws-crt/pom.xml +++ b/core/http-auth-aws-crt/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>core</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>http-auth-aws-crt</artifactId> diff --git a/core/http-auth-aws-eventstream/pom.xml b/core/http-auth-aws-eventstream/pom.xml index 68369f8f77fd..d775e73bd9b7 100644 --- a/core/http-auth-aws-eventstream/pom.xml +++ b/core/http-auth-aws-eventstream/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>core</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>http-auth-aws-eventstream</artifactId> diff --git a/core/http-auth-aws/pom.xml b/core/http-auth-aws/pom.xml index 49d85b896536..41a3dc75cea4 100644 --- a/core/http-auth-aws/pom.xml +++ b/core/http-auth-aws/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>core</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>http-auth-aws</artifactId> diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/signer/AwsV4FamilyHttpSigner.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/signer/AwsV4FamilyHttpSigner.java index dd6ebdf72760..5041047cb509 100644 --- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/signer/AwsV4FamilyHttpSigner.java +++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/signer/AwsV4FamilyHttpSigner.java @@ -29,7 +29,8 @@ @SdkPublicApi public interface AwsV4FamilyHttpSigner<T extends Identity> extends HttpSigner<T> { /** - * The name of the AWS service. This property is required. + * The name of the AWS service. This property is required. This value can be found in the service documentation or + * on the service client itself (e.g. {@code S3Client.SERVICE_NAME}). */ SignerProperty<String> SERVICE_SIGNING_NAME = SignerProperty.create(AwsV4FamilyHttpSigner.class, "ServiceSigningName"); @@ -37,6 +38,8 @@ public interface AwsV4FamilyHttpSigner<T extends Identity> extends HttpSigner<T> /** * A boolean to indicate whether to double url-encode the resource path when constructing the canonical request. This property * defaults to true. + * <p> + * Note: S3 requires this value to be set to 'false' to prevent signature mismatch errors for certain paths. */ SignerProperty<Boolean> DOUBLE_URL_ENCODE = SignerProperty.create(AwsV4FamilyHttpSigner.class, "DoubleUrlEncode"); @@ -44,6 +47,8 @@ public interface AwsV4FamilyHttpSigner<T extends Identity> extends HttpSigner<T> /** * A boolean to indicate whether the resource path should be "normalized" according to RFC3986 when constructing the canonical * request. This property defaults to true. + * <p> + * Note: S3 requires this value to be set to 'false' to prevent signature mismatch errors for certain paths. */ SignerProperty<Boolean> NORMALIZE_PATH = SignerProperty.create(AwsV4FamilyHttpSigner.class, "NormalizePath"); @@ -64,13 +69,21 @@ public interface AwsV4FamilyHttpSigner<T extends Identity> extends HttpSigner<T> /** * Whether to indicate that a payload is signed or not. This property defaults to true. This can be set false to disable * payload signing. + * <p> + * When this value is true and {@link #CHUNK_ENCODING_ENABLED} is false, the whole payload must be read to generate + * the payload signature. For very large payloads, this could impact memory usage and call latency. Some services + * support this value being disabled, especially over HTTPS where SSL provides some of its own protections against + * payload tampering. */ SignerProperty<Boolean> PAYLOAD_SIGNING_ENABLED = SignerProperty.create(AwsV4FamilyHttpSigner.class, "PayloadSigningEnabled"); /** * Whether to indicate that a payload is chunk-encoded or not. This property defaults to false. This can be set true to - * enable the `aws-chunk` content-encoding + * enable the `aws-chunked` content-encoding. + * <p> + * Only some services support this value being set to true, but for those services it can prevent the need to read + * the whole payload before writing when {@link #PAYLOAD_SIGNING_ENABLED} is true. */ SignerProperty<Boolean> CHUNK_ENCODING_ENABLED = SignerProperty.create(AwsV4FamilyHttpSigner.class, "ChunkEncodingEnabled"); diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/signer/AwsV4HttpSigner.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/signer/AwsV4HttpSigner.java index 4b85c017c0f5..ee3656f946e4 100644 --- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/signer/AwsV4HttpSigner.java +++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/signer/AwsV4HttpSigner.java @@ -22,10 +22,67 @@ import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity; /** - * An {@link HttpSigner} that will sign a request using an AWS credentials {@link AwsCredentialsIdentity}). + * An {@link HttpSigner} that will use the AWS V4 signing algorithm to sign a request using an + * {@link AwsCredentialsIdentity}). + * * <p> - * The process for signing requests to send to AWS services is documented + * The steps performed by this signer are documented * <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_aws-signing.html">here</a>. + * + * <h2>Using the AwsV4HttpSigner</h2> + * <p> + * <b>Sign an HTTP request and send it to a service.</b> + * <p> + * {@snippet : + * AwsV4HttpSigner signer = AwsV4HttpSigner.create(); + * + * // Specify AWS credentials. Credential providers that are used by the SDK by default are + * // available in the module "auth" (e.g. DefaultCredentialsProvider). + * AwsCredentialsIdentity credentials = + * AwsSessionCredentialsIdentity.create("skid", "akid", "stok"); + * + * // Create the HTTP request to be signed + * SdkHttpRequest httpRequest = + * SdkHttpRequest.builder() + * .uri("https://s3.us-west-2.amazonaws.com/bucket/object") + * .method(SdkHttpMethod.PUT) + * .putHeader("Content-Type", "text/plain") + * .build(); + * + * // Create the request payload to be signed + * ContentStreamProvider requestPayload = + * ContentStreamProvider.fromUtf8String("Hello, World!"); + * + * // Sign the request. Some services require custom signing configuration properties (e.g. S3). + * // See AwsV4HttpSigner and AwsV4FamilyHttpSigner for the available signing options. + * // Note: The S3Client class below requires a dependency on the 's3' module. Alternatively, the + * // signing name can be hard-coded because it is guaranteed to not change. + * SignedRequest signedRequest = + * signer.sign(r -> r.identity(credentials) + * .request(httpRequest) + * .payload(requestPayload) + * .putProperty(AwsV4HttpSigner.SERVICE_SIGNING_NAME, S3Client.SERVICE_NAME) + * .putProperty(AwsV4HttpSigner.REGION_NAME, "us-west-2") + * .putProperty(AwsV4HttpSigner.DOUBLE_URL_ENCODE, false) // Required for S3 only + * .putProperty(AwsV4HttpSigner.NORMALIZE_PATH, false)); // Required for S3 only + * + * // Create and HTTP client and send the request. ApacheHttpClient requires the 'apache-client' module. + * try (SdkHttpClient httpClient = ApacheHttpClient.create()) { + * HttpExecuteRequest httpExecuteRequest = + * HttpExecuteRequest.builder() + * .request(signedRequest.request()) + * .contentStreamProvider(signedRequest.payload().orElse(null)) + * .build(); + * + * HttpExecuteResponse httpResponse = + * httpClient.prepareRequest(httpExecuteRequest).call(); + * + * System.out.println("HTTP Status Code: " + httpResponse.httpResponse().statusCode()); + * } catch (IOException e) { + * System.err.println("HTTP Request Failed."); + * e.printStackTrace(); + * } + * } */ @SdkPublicApi public interface AwsV4HttpSigner extends AwsV4FamilyHttpSigner<AwsCredentialsIdentity> { diff --git a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/signer/AwsV4aHttpSigner.java b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/signer/AwsV4aHttpSigner.java index 686ac70645aa..503d2de7e0ef 100644 --- a/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/signer/AwsV4aHttpSigner.java +++ b/core/http-auth-aws/src/main/java/software/amazon/awssdk/http/auth/aws/signer/AwsV4aHttpSigner.java @@ -23,10 +23,67 @@ import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity; /** - * An {@link HttpSigner} that will sign a request using an AWS credentials {@link AwsCredentialsIdentity}). + * An {@link HttpSigner} that will use the AWS V4a signing algorithm to sign a request using an + * {@link AwsCredentialsIdentity}). + * * <p> - * The process for signing requests to send to AWS services is documented + * AWS request signing is described * <a href="https://docs.aws.amazon.com/IAM/latest/UserGuide/reference_aws-signing.html">here</a>. + * + * <h2>Using the AwsV4aHttpSigner</h2> + * <p> + * <b>Sign an HTTP request and send it to a service.</b> + * <p> + * {@snippet : + * AwsV4aHttpSigner signer = AwsV4aHttpSigner.create(); + * + * // Specify AWS credentials. Credential providers that are used by the SDK by default are + * // available in the module "auth" (e.g. DefaultCredentialsProvider). + * AwsCredentialsIdentity credentials = + * AwsSessionCredentialsIdentity.create("skid", "akid", "stok"); + * + * // Create the HTTP request to be signed + * SdkHttpRequest httpRequest = + * SdkHttpRequest.builder() + * .uri("https://s3.us-west-2.amazonaws.com/bucket/object") + * .method(SdkHttpMethod.PUT) + * .putHeader("Content-Type", "text/plain") + * .build(); + * + * // Create the request payload to be signed + * ContentStreamProvider requestPayload = + * ContentStreamProvider.fromUtf8String("Hello, World!"); + * + * // Sign the request. Some services require custom signing configuration properties (e.g. S3). + * // See AwsV4aHttpSigner and AwsV4FamilyHttpSigner for the available signing options. + * // Note: The S3Client class below requires a dependency on the 's3' module. Alternatively, the + * // signing name can be hard-coded because it is guaranteed to not change. + * SignedRequest signedRequest = + * signer.sign(r -> r.identity(credentials) + * .request(httpRequest) + * .payload(requestPayload) + * .putProperty(AwsV4aHttpSigner.SERVICE_SIGNING_NAME, S3Client.SERVICE_NAME) + * .putProperty(AwsV4aHttpSigner.REGION_SET, RegionSet.create("us-west-2")) + * .putProperty(AwsV4aHttpSigner.DOUBLE_URL_ENCODE, false) // Required for S3 only + * .putProperty(AwsV4aHttpSigner.NORMALIZE_PATH, false)); // Required for S3 only + * + * // Create and HTTP client and send the request. ApacheHttpClient requires the 'apache-client' module. + * try (SdkHttpClient httpClient = ApacheHttpClient.create()) { + * HttpExecuteRequest httpExecuteRequest = + * HttpExecuteRequest.builder() + * .request(signedRequest.request()) + * .contentStreamProvider(signedRequest.payload().orElse(null)) + * .build(); + * + * HttpExecuteResponse httpResponse = + * httpClient.prepareRequest(httpExecuteRequest).call(); + * + * System.out.println("HTTP Status Code: " + httpResponse.httpResponse().statusCode()); + * } catch (IOException e) { + * System.err.println("HTTP Request Failed."); + * e.printStackTrace(); + * } + * } */ @SdkPublicApi public interface AwsV4aHttpSigner extends AwsV4FamilyHttpSigner<AwsCredentialsIdentity> { @@ -41,5 +98,4 @@ public interface AwsV4aHttpSigner extends AwsV4FamilyHttpSigner<AwsCredentialsId static AwsV4aHttpSigner create() { return getDefaultAwsCrtV4aHttpSigner(); } - } diff --git a/core/http-auth-spi/pom.xml b/core/http-auth-spi/pom.xml index 64f52dd72dee..e0376ea69197 100644 --- a/core/http-auth-spi/pom.xml +++ b/core/http-auth-spi/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>core</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>http-auth-spi</artifactId> diff --git a/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/internal/signer/NoOpHttpSigner.java b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/internal/signer/NoOpHttpSigner.java new file mode 100644 index 000000000000..f70e7d277da8 --- /dev/null +++ b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/internal/signer/NoOpHttpSigner.java @@ -0,0 +1,44 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package software.amazon.awssdk.http.auth.spi.internal.signer; + +import java.util.concurrent.CompletableFuture; +import software.amazon.awssdk.annotations.SdkInternalApi; +import software.amazon.awssdk.http.auth.spi.signer.AsyncSignRequest; +import software.amazon.awssdk.http.auth.spi.signer.AsyncSignedRequest; +import software.amazon.awssdk.http.auth.spi.signer.HttpSigner; +import software.amazon.awssdk.http.auth.spi.signer.SignRequest; +import software.amazon.awssdk.http.auth.spi.signer.SignedRequest; +import software.amazon.awssdk.identity.spi.Identity; + +@SdkInternalApi +public class NoOpHttpSigner<T extends Identity> implements HttpSigner<T> { + @Override + public SignedRequest sign(SignRequest<? extends T> request) { + return SignedRequest.builder() + .request(request.request()) + .payload(request.payload().orElse(null)) + .build(); + } + + @Override + public CompletableFuture<AsyncSignedRequest> signAsync(AsyncSignRequest<? extends T> request) { + return CompletableFuture.completedFuture(AsyncSignedRequest.builder() + .request(request.request()) + .payload(request.payload().orElse(null)) + .build()); + } +} diff --git a/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/HttpSigner.java b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/HttpSigner.java index 5aafbe51e116..0f60bae1d7e0 100644 --- a/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/HttpSigner.java +++ b/core/http-auth-spi/src/main/java/software/amazon/awssdk/http/auth/spi/signer/HttpSigner.java @@ -21,6 +21,7 @@ import software.amazon.awssdk.annotations.SdkPublicApi; import software.amazon.awssdk.http.auth.spi.internal.signer.DefaultAsyncSignRequest; import software.amazon.awssdk.http.auth.spi.internal.signer.DefaultSignRequest; +import software.amazon.awssdk.http.auth.spi.internal.signer.NoOpHttpSigner; import software.amazon.awssdk.identity.spi.Identity; /** @@ -31,7 +32,6 @@ */ @SdkPublicApi public interface HttpSigner<IdentityT extends Identity> { - /** * A {@link Clock} to be used to derive the signing time. This property defaults to the system clock. * @@ -39,6 +39,13 @@ public interface HttpSigner<IdentityT extends Identity> { */ SignerProperty<Clock> SIGNING_CLOCK = SignerProperty.create(HttpSigner.class, "SigningClock"); + /** + * Retrieve a signer that returns the input message, without signing. + */ + default <T extends Identity> HttpSigner<T> doNotSign() { + return new NoOpHttpSigner<>(); + } + /** * Method that takes in inputs to sign a request with sync payload and returns a signed version of the request. * @@ -84,4 +91,5 @@ default SignedRequest sign(Consumer<SignRequest.Builder<IdentityT>> consumer) { default CompletableFuture<AsyncSignedRequest> signAsync(Consumer<AsyncSignRequest.Builder<IdentityT>> consumer) { return signAsync(DefaultAsyncSignRequest.<IdentityT>builder().applyMutation(consumer).build()); } + } diff --git a/core/http-auth/pom.xml b/core/http-auth/pom.xml index 96c81449d1f5..b35d97685241 100644 --- a/core/http-auth/pom.xml +++ b/core/http-auth/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>core</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>http-auth</artifactId> diff --git a/core/identity-spi/pom.xml b/core/identity-spi/pom.xml index faa02adb65de..5a79e8c84227 100644 --- a/core/identity-spi/pom.xml +++ b/core/identity-spi/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>core</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>identity-spi</artifactId> diff --git a/core/imds/pom.xml b/core/imds/pom.xml index 9650bcc59eb4..5a8aafea101c 100644 --- a/core/imds/pom.xml +++ b/core/imds/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>core</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>imds</artifactId> diff --git a/core/json-utils/pom.xml b/core/json-utils/pom.xml index dad80f1c6312..78314c97a056 100644 --- a/core/json-utils/pom.xml +++ b/core/json-utils/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>core</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/core/metrics-spi/pom.xml b/core/metrics-spi/pom.xml index 094555fe9a35..d27f2fc2799c 100644 --- a/core/metrics-spi/pom.xml +++ b/core/metrics-spi/pom.xml @@ -5,7 +5,7 @@ <parent> <artifactId>core</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/core/pom.xml b/core/pom.xml index e76e7ec8d0a0..c558573645fd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>core</artifactId> diff --git a/core/profiles/pom.xml b/core/profiles/pom.xml index f668cd472a72..3a8c8bdc88b5 100644 --- a/core/profiles/pom.xml +++ b/core/profiles/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>core</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>profiles</artifactId> diff --git a/core/protocols/aws-cbor-protocol/pom.xml b/core/protocols/aws-cbor-protocol/pom.xml index bbdff2d28f1a..0ba93d05c7b1 100644 --- a/core/protocols/aws-cbor-protocol/pom.xml +++ b/core/protocols/aws-cbor-protocol/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>protocols</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/core/protocols/aws-json-protocol/pom.xml b/core/protocols/aws-json-protocol/pom.xml index ff999b502452..acd66378fd36 100644 --- a/core/protocols/aws-json-protocol/pom.xml +++ b/core/protocols/aws-json-protocol/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>protocols</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/core/protocols/aws-query-protocol/pom.xml b/core/protocols/aws-query-protocol/pom.xml index ad30c8d567f7..a7db48345a6d 100644 --- a/core/protocols/aws-query-protocol/pom.xml +++ b/core/protocols/aws-query-protocol/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>protocols</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/core/protocols/aws-xml-protocol/pom.xml b/core/protocols/aws-xml-protocol/pom.xml index 05c58bc0f8f3..ce1a4124f181 100644 --- a/core/protocols/aws-xml-protocol/pom.xml +++ b/core/protocols/aws-xml-protocol/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>protocols</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/core/protocols/pom.xml b/core/protocols/pom.xml index d644bc145d75..99dc60341d63 100644 --- a/core/protocols/pom.xml +++ b/core/protocols/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>core</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/core/protocols/protocol-core/pom.xml b/core/protocols/protocol-core/pom.xml index ebd698ca446f..2eb08c0b5c69 100644 --- a/core/protocols/protocol-core/pom.xml +++ b/core/protocols/protocol-core/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>protocols</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/core/regions/pom.xml b/core/regions/pom.xml index f9cdf27947ea..9092518449c4 100644 --- a/core/regions/pom.xml +++ b/core/regions/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>core</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>regions</artifactId> diff --git a/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json b/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json index 30c2ac8bca2f..24ae0282309b 100644 --- a/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json +++ b/core/regions/src/main/resources/software/amazon/awssdk/regions/internal/region/endpoints.json @@ -2682,6 +2682,12 @@ }, "hostname" : "bedrock.ap-southeast-2.amazonaws.com" }, + "bedrock-ca-central-1" : { + "credentialScope" : { + "region" : "ca-central-1" + }, + "hostname" : "bedrock.ca-central-1.amazonaws.com" + }, "bedrock-eu-central-1" : { "credentialScope" : { "region" : "eu-central-1" @@ -2694,6 +2700,12 @@ }, "hostname" : "bedrock.eu-west-1.amazonaws.com" }, + "bedrock-eu-west-2" : { + "credentialScope" : { + "region" : "eu-west-2" + }, + "hostname" : "bedrock.eu-west-2.amazonaws.com" + }, "bedrock-eu-west-3" : { "credentialScope" : { "region" : "eu-west-3" @@ -2736,6 +2748,12 @@ }, "hostname" : "bedrock-runtime.ap-southeast-2.amazonaws.com" }, + "bedrock-runtime-ca-central-1" : { + "credentialScope" : { + "region" : "ca-central-1" + }, + "hostname" : "bedrock-runtime.ca-central-1.amazonaws.com" + }, "bedrock-runtime-eu-central-1" : { "credentialScope" : { "region" : "eu-central-1" @@ -2748,6 +2766,12 @@ }, "hostname" : "bedrock-runtime.eu-west-1.amazonaws.com" }, + "bedrock-runtime-eu-west-2" : { + "credentialScope" : { + "region" : "eu-west-2" + }, + "hostname" : "bedrock-runtime.eu-west-2.amazonaws.com" + }, "bedrock-runtime-eu-west-3" : { "credentialScope" : { "region" : "eu-west-3" @@ -2766,6 +2790,12 @@ }, "hostname" : "bedrock-runtime-fips.us-west-2.amazonaws.com" }, + "bedrock-runtime-sa-east-1" : { + "credentialScope" : { + "region" : "sa-east-1" + }, + "hostname" : "bedrock-runtime.sa-east-1.amazonaws.com" + }, "bedrock-runtime-us-east-1" : { "credentialScope" : { "region" : "us-east-1" @@ -2778,6 +2808,12 @@ }, "hostname" : "bedrock-runtime.us-west-2.amazonaws.com" }, + "bedrock-sa-east-1" : { + "credentialScope" : { + "region" : "sa-east-1" + }, + "hostname" : "bedrock.sa-east-1.amazonaws.com" + }, "bedrock-us-east-1" : { "credentialScope" : { "region" : "us-east-1" @@ -2790,9 +2826,12 @@ }, "hostname" : "bedrock.us-west-2.amazonaws.com" }, + "ca-central-1" : { }, "eu-central-1" : { }, "eu-west-1" : { }, + "eu-west-2" : { }, "eu-west-3" : { }, + "sa-east-1" : { }, "us-east-1" : { }, "us-west-2" : { } } @@ -2832,6 +2871,8 @@ }, "cases" : { "endpoints" : { + "ap-northeast-1" : { }, + "ap-northeast-2" : { }, "ap-southeast-1" : { }, "ap-southeast-2" : { }, "ca-central-1" : { }, @@ -2951,28 +2992,116 @@ }, "cloud9" : { "endpoints" : { - "af-south-1" : { }, - "ap-east-1" : { }, - "ap-northeast-1" : { }, - "ap-northeast-2" : { }, - "ap-northeast-3" : { }, - "ap-south-1" : { }, - "ap-southeast-1" : { }, - "ap-southeast-2" : { }, - "ca-central-1" : { }, - "eu-central-1" : { }, - "eu-north-1" : { }, - "eu-south-1" : { }, - "eu-west-1" : { }, - "eu-west-2" : { }, - "eu-west-3" : { }, - "il-central-1" : { }, - "me-south-1" : { }, - "sa-east-1" : { }, - "us-east-1" : { }, - "us-east-2" : { }, - "us-west-1" : { }, - "us-west-2" : { } + "af-south-1" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "ap-east-1" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "ap-northeast-1" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "ap-northeast-2" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "ap-northeast-3" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "ap-south-1" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "ap-southeast-1" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "ap-southeast-2" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "ca-central-1" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "eu-central-1" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "eu-north-1" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "eu-south-1" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "eu-west-1" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "eu-west-2" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "eu-west-3" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "il-central-1" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "me-south-1" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "sa-east-1" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "us-east-1" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "us-east-2" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "us-west-1" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + }, + "us-west-2" : { + "variants" : [ { + "tags" : [ "dualstack" ] + } ] + } } }, "cloudcontrolapi" : { @@ -5249,8 +5378,18 @@ "ap-southeast-2" : { }, "ap-southeast-3" : { }, "ap-southeast-4" : { }, - "ca-central-1" : { }, - "ca-west-1" : { }, + "ca-central-1" : { + "variants" : [ { + "hostname" : "directconnect-fips.ca-central-1.amazonaws.com", + "tags" : [ "fips" ] + } ] + }, + "ca-west-1" : { + "variants" : [ { + "hostname" : "directconnect-fips.ca-west-1.amazonaws.com", + "tags" : [ "fips" ] + } ] + }, "eu-central-1" : { }, "eu-central-2" : { }, "eu-north-1" : { }, @@ -5259,6 +5398,20 @@ "eu-west-1" : { }, "eu-west-2" : { }, "eu-west-3" : { }, + "fips-ca-central-1" : { + "credentialScope" : { + "region" : "ca-central-1" + }, + "deprecated" : true, + "hostname" : "directconnect-fips.ca-central-1.amazonaws.com" + }, + "fips-ca-west-1" : { + "credentialScope" : { + "region" : "ca-west-1" + }, + "deprecated" : true, + "hostname" : "directconnect-fips.ca-west-1.amazonaws.com" + }, "fips-us-east-1" : { "credentialScope" : { "region" : "us-east-1" @@ -10176,9 +10329,21 @@ "ap-south-1" : { }, "ap-southeast-1" : { }, "ap-southeast-2" : { }, - "ca-central-1" : { }, + "ca-central-1" : { + "variants" : [ { + "hostname" : "kendra-fips.ca-central-1.amazonaws.com", + "tags" : [ "fips" ] + } ] + }, "eu-west-1" : { }, "eu-west-2" : { }, + "fips-ca-central-1" : { + "credentialScope" : { + "region" : "ca-central-1" + }, + "deprecated" : true, + "hostname" : "kendra-fips.ca-central-1.amazonaws.com" + }, "fips-us-east-1" : { "credentialScope" : { "region" : "us-east-1" @@ -18512,6 +18677,19 @@ "deprecated" : true, "hostname" : "storagegateway-fips.ca-central-1.amazonaws.com" }, + "ca-west-1" : { + "variants" : [ { + "hostname" : "storagegateway-fips.ca-west-1.amazonaws.com", + "tags" : [ "fips" ] + } ] + }, + "ca-west-1-fips" : { + "credentialScope" : { + "region" : "ca-west-1" + }, + "deprecated" : true, + "hostname" : "storagegateway-fips.ca-west-1.amazonaws.com" + }, "eu-central-1" : { }, "eu-central-2" : { }, "eu-north-1" : { }, diff --git a/core/retries-spi/pom.xml b/core/retries-spi/pom.xml index 00bb99838889..f27846437401 100644 --- a/core/retries-spi/pom.xml +++ b/core/retries-spi/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>core</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/core/retries/pom.xml b/core/retries/pom.xml index 4a52cb020479..941d674c5774 100644 --- a/core/retries/pom.xml +++ b/core/retries/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>core</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/core/sdk-core/pom.xml b/core/sdk-core/pom.xml index 659cc2e5600c..cad1701dd7dc 100644 --- a/core/sdk-core/pom.xml +++ b/core/sdk-core/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>core</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>sdk-core</artifactId> <name>AWS Java SDK :: SDK Core</name> diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/AsyncRequestBody.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/AsyncRequestBody.java index 2e55918ed3de..b39f7b568a11 100644 --- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/AsyncRequestBody.java +++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/AsyncRequestBody.java @@ -384,8 +384,8 @@ static AsyncRequestBody fromInputStream(Consumer<AsyncRequestBodyFromInputStream /** * Creates a {@link BlockingInputStreamAsyncRequestBody} to use for writing an input stream to the downstream service. * - * <p>By default, it will time out if streaming hasn't started within 10 seconds, and you can configure the timeout - * via {@link BlockingInputStreamAsyncRequestBody#builder()} + * <p>By default, it will time out if streaming hasn't started within 10 seconds, and use application/octet-stream as + * content type. You can configure it via {@link BlockingInputStreamAsyncRequestBody#builder()} * <p><b>Example Usage</b> * * <p> diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/BlockingInputStreamAsyncRequestBody.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/BlockingInputStreamAsyncRequestBody.java index 9210f3bb5e41..3639d82c04c1 100644 --- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/BlockingInputStreamAsyncRequestBody.java +++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/BlockingInputStreamAsyncRequestBody.java @@ -26,6 +26,7 @@ import software.amazon.awssdk.annotations.SdkPublicApi; import software.amazon.awssdk.core.exception.NonRetryableException; import software.amazon.awssdk.core.internal.io.SdkLengthAwareInputStream; +import software.amazon.awssdk.core.internal.util.Mimetype; import software.amazon.awssdk.core.internal.util.NoopSubscription; import software.amazon.awssdk.utils.Validate; import software.amazon.awssdk.utils.async.InputStreamConsumingPublisher; @@ -39,14 +40,17 @@ @SdkPublicApi public final class BlockingInputStreamAsyncRequestBody implements AsyncRequestBody { private static final Duration DEFAULT_SUBSCRIBE_TIMEOUT = Duration.ofSeconds(10); + private static final String DEFAULT_CONTENT_TYPE = Mimetype.MIMETYPE_OCTET_STREAM; private final InputStreamConsumingPublisher delegate = new InputStreamConsumingPublisher(); private final CountDownLatch subscribedLatch = new CountDownLatch(1); private final AtomicBoolean subscribeCalled = new AtomicBoolean(false); private final Long contentLength; + private final String contentType; private final Duration subscribeTimeout; BlockingInputStreamAsyncRequestBody(Builder builder) { this.contentLength = builder.contentLength; + this.contentType = builder.contentType != null ? builder.contentType : DEFAULT_CONTENT_TYPE; this.subscribeTimeout = Validate.isPositiveOrNull(builder.subscribeTimeout, "subscribeTimeout") != null ? builder.subscribeTimeout : DEFAULT_SUBSCRIBE_TIMEOUT; @@ -64,6 +68,11 @@ public Optional<Long> contentLength() { return Optional.ofNullable(contentLength); } + @Override + public String contentType() { + return contentType; + } + /** * Block the calling thread and write the provided input stream to the downstream service. * @@ -123,6 +132,7 @@ private void waitForSubscriptionIfNeeded() throws InterruptedException { public static final class Builder { private Duration subscribeTimeout; private Long contentLength; + private String contentType; private Builder() { } @@ -152,6 +162,17 @@ public Builder contentLength(Long contentLength) { return this; } + /** + * The content type of the output stream. + * + * @param contentType the content type + * @return Returns a reference to this object so that method calls can be chained together. + */ + public Builder contentType(String contentType) { + this.contentType = contentType; + return this; + } + public BlockingInputStreamAsyncRequestBody build() { return new BlockingInputStreamAsyncRequestBody(this); } diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/AsyncRequestBodySigner.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/AsyncRequestBodySigner.java index fca744c562de..e0ef03e70b03 100644 --- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/AsyncRequestBodySigner.java +++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/AsyncRequestBodySigner.java @@ -22,9 +22,12 @@ /** * Interface for the signer used for signing the async requests. + * + * @deprecated Replaced by {@code software.amazon.awssdk.http.auth.spi.signer.HttpSigner} in 'http-auth-spi'. */ @SdkPublicApi @FunctionalInterface +@Deprecated public interface AsyncRequestBodySigner { /** * Method that takes in an signed request and async request body provider, diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/AsyncSigner.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/AsyncSigner.java index ee31dfffbe91..e901242db74f 100644 --- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/AsyncSigner.java +++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/AsyncSigner.java @@ -23,8 +23,11 @@ /** * A signer capable of including the contents of the asynchronous body into the request calculation. + * + * @deprecated Replaced by {@code software.amazon.awssdk.http.auth.spi.signer.HttpSigner} in 'http-auth-spi'. */ @SdkPublicApi +@Deprecated public interface AsyncSigner { /** * Sign the request, including the contents of the body into the signature calculation. diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/NoOpSigner.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/NoOpSigner.java index e6f2f96dd1d6..ae0576920998 100644 --- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/NoOpSigner.java +++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/NoOpSigner.java @@ -22,8 +22,12 @@ /** * A No op implementation of Signer and Presigner interfaces that returns the * input {@link SdkHttpFullRequest} without modifications. + * + * @deprecated Replaced by {@code software.amazon.awssdk.http.auth.spi.signer.HttpSigner#doNotSign()} in + * 'http-auth-spi'. */ @SdkPublicApi +@Deprecated public final class NoOpSigner implements Signer, Presigner { @Override diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Presigner.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Presigner.java index f3eeda10be93..025e86dcf4d5 100644 --- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Presigner.java +++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Presigner.java @@ -22,9 +22,12 @@ /** * Interface for the signer used for pre-signing the requests. All SDK signer implementations that support pre-signing * will implement this interface. + * + * @deprecated Replaced by {@code software.amazon.awssdk.http.auth.spi.signer.HttpSigner} in 'http-auth-spi'. */ @SdkPublicApi @FunctionalInterface +@Deprecated public interface Presigner { /** * Method that takes in an request and returns a pre signed version of the request. diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Signer.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Signer.java index c44adaa37089..e43b420d908c 100644 --- a/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Signer.java +++ b/core/sdk-core/src/main/java/software/amazon/awssdk/core/signer/Signer.java @@ -22,9 +22,12 @@ /** * Interface for the signer used for signing the requests. All SDK signer implementations will implement this interface. + * + * @deprecated Replaced by {@code software.amazon.awssdk.http.auth.spi.signer.HttpSigner} in 'http-auth-spi'. */ @SdkPublicApi @FunctionalInterface +@Deprecated public interface Signer { /** * Method that takes in an request and returns a signed version of the request. diff --git a/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/BlockingInputStreamAsyncRequestBodyTest.java b/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/BlockingInputStreamAsyncRequestBodyTest.java index d0d8ef761bf0..483220a2f508 100644 --- a/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/BlockingInputStreamAsyncRequestBodyTest.java +++ b/core/sdk-core/src/test/java/software/amazon/awssdk/core/async/BlockingInputStreamAsyncRequestBodyTest.java @@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream; import java.nio.ByteBuffer; import java.time.Duration; +import java.util.Optional; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import org.junit.jupiter.api.Test; @@ -76,4 +77,26 @@ public void doBlockingWrite_writesToSubscriber() { } } + @Test + public void builder_withContentType_buildsCorrectly() { + BlockingInputStreamAsyncRequestBody.Builder requestBodyBuilder = BlockingInputStreamAsyncRequestBody.builder(); + BlockingInputStreamAsyncRequestBody requestBody = requestBodyBuilder + .contentLength(20L) + .contentType("text/plain") + .build(); + + assertThat(requestBody.contentLength()).isEqualTo(Optional.of(20L)); + assertThat(requestBody.contentType()).isEqualTo("text/plain"); + } + + @Test + public void builder_withoutContentType_defaultsToOctetStream() { + BlockingInputStreamAsyncRequestBody.Builder requestBodyBuilder = BlockingInputStreamAsyncRequestBody.builder(); + BlockingInputStreamAsyncRequestBody requestBody = requestBodyBuilder + .contentLength(20L) + .build(); + + assertThat(requestBody.contentLength()).isEqualTo(Optional.of(20L)); + assertThat(requestBody.contentType()).isEqualTo("application/octet-stream"); + } } \ No newline at end of file diff --git a/http-client-spi/pom.xml b/http-client-spi/pom.xml index 02f0bf43cd08..2b7526cd2dea 100644 --- a/http-client-spi/pom.xml +++ b/http-client-spi/pom.xml @@ -22,7 +22,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>http-client-spi</artifactId> <name>AWS Java SDK :: HTTP Client Interface</name> diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/ContentStreamProvider.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/ContentStreamProvider.java index cbb63dc2faf2..59493fd33e4d 100644 --- a/http-client-spi/src/main/java/software/amazon/awssdk/http/ContentStreamProvider.java +++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/ContentStreamProvider.java @@ -15,21 +15,119 @@ package software.amazon.awssdk.http; +import static software.amazon.awssdk.utils.FunctionalUtils.invokeSafely; + +import java.io.ByteArrayInputStream; import java.io.InputStream; +import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.function.Supplier; import software.amazon.awssdk.annotations.SdkPublicApi; +import software.amazon.awssdk.utils.IoUtils; +import software.amazon.awssdk.utils.StringInputStream; +import software.amazon.awssdk.utils.Validate; /** * Provides the content stream of a request. * <p> - * Each call to to the {@link #newStream()} method must result in a stream whose position is at the beginning of the content. + * Each call to the {@link #newStream()} method must result in a stream whose position is at the beginning of the content. * Implementations may return a new stream or the same stream for each call. If returning a new stream, the implementation * must ensure to {@code close()} and free any resources acquired by the previous stream. The last stream returned by {@link * #newStream()}} will be closed by the SDK. - * */ @SdkPublicApi @FunctionalInterface public interface ContentStreamProvider { + /** + * Create {@link ContentStreamProvider} from a byte array. This will copy the contents of the byte array. + */ + static ContentStreamProvider fromByteArray(byte[] bytes) { + Validate.paramNotNull(bytes, "bytes"); + byte[] copy = Arrays.copyOf(bytes, bytes.length); + return () -> new ByteArrayInputStream(copy); + } + + /** + * Create {@link ContentStreamProvider} from a byte array <b>without</b> copying the contents of the byte array. + * This introduces concurrency risks, allowing the caller to modify the byte array stored in this + * {@code ContentStreamProvider} implementation. + * + * <p>As the method name implies, this is unsafe. Use {@link #fromByteArray(byte[])} unless you're sure you know + * the risks. + */ + static ContentStreamProvider fromByteArrayUnsafe(byte[] bytes) { + Validate.paramNotNull(bytes, "bytes"); + return () -> new ByteArrayInputStream(bytes); + } + + /** + * Create {@link ContentStreamProvider} from a string, using the provided charset. + */ + static ContentStreamProvider fromString(String string, Charset charset) { + Validate.paramNotNull(string, "string"); + Validate.paramNotNull(charset, "charset"); + return () -> new StringInputStream(string, charset); + } + + /** + * Create {@link ContentStreamProvider} from a string, using the UTF-8 charset. + */ + static ContentStreamProvider fromUtf8String(String string) { + return fromString(string, StandardCharsets.UTF_8); + } + + /** + * Create a {@link ContentStreamProvider} from an input stream. + * <p> + * If the provided input stream supports mark/reset, the stream will be marked with a 128Kb read limit and reset + * each time {@link #newStream()} is invoked. If the provided input stream does not support mark/reset, + * {@link #newStream()} will return the provided stream once, but fail subsequent calls. To create new streams when + * needed instead of using mark/reset, see {@link #fromInputStreamSupplier(Supplier)}. + */ + static ContentStreamProvider fromInputStream(InputStream inputStream) { + Validate.paramNotNull(inputStream, "inputStream"); + IoUtils.markStreamWithMaxReadLimit(inputStream); + return new ContentStreamProvider() { + private boolean first = true; + @Override + public InputStream newStream() { + if (first) { + first = false; + return inputStream; + } + + if (inputStream.markSupported()) { + invokeSafely(inputStream::reset); + return inputStream; + } + + throw new IllegalStateException("Content input stream does not support mark/reset, " + + "and was already read once."); + } + }; + } + + /** + * Create {@link ContentStreamProvider} from an input stream supplier. Each time a new stream is retrieved from + * this content stream provider, the last one returned will be closed. + */ + static ContentStreamProvider fromInputStreamSupplier(Supplier<InputStream> inputStreamSupplier) { + Validate.paramNotNull(inputStreamSupplier, "inputStreamSupplier"); + return new ContentStreamProvider() { + private InputStream lastStream; + + @Override + public InputStream newStream() { + if (lastStream != null) { + invokeSafely(lastStream::close); + } + lastStream = inputStreamSupplier.get(); + return lastStream; + } + }; + } + /** * @return The content stream. */ diff --git a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpRequest.java b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpRequest.java index d011f9d7b19a..bb34909b5f36 100644 --- a/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpRequest.java +++ b/http-client-spi/src/main/java/software/amazon/awssdk/http/SdkHttpRequest.java @@ -191,6 +191,17 @@ default Builder uri(URI uri) { return builder; } + /** + * Convenience method to set the {@link #protocol()}, {@link #host()}, {@link #port()}, + * {@link #encodedPath()} and extracts query parameters from a URI string. + * + * @param uri URI containing protocol, host, port and path. + * @return This builder for method chaining. + */ + default Builder uri(String uri) { + return uri(URI.create(uri)); + } + /** * The protocol, exactly as it was configured with {@link #protocol(String)}. */ diff --git a/http-client-spi/src/test/java/software/amazon/awssdk/http/ContentStreamProviderTest.java b/http-client-spi/src/test/java/software/amazon/awssdk/http/ContentStreamProviderTest.java new file mode 100644 index 000000000000..1298360f753b --- /dev/null +++ b/http-client-spi/src/test/java/software/amazon/awssdk/http/ContentStreamProviderTest.java @@ -0,0 +1,188 @@ +/* + * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"). + * You may not use this file except in compliance with the License. + * A copy of the License is located at + * + * http://aws.amazon.com/apache2.0 + * + * or in the "license" file accompanying this file. This file is distributed + * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either + * express or implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package software.amazon.awssdk.http; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.*; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Arrays; +import java.util.function.Supplier; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import software.amazon.awssdk.utils.IoUtils; +import software.amazon.awssdk.utils.StringInputStream; + +class ContentStreamProviderTest { + @Test + void fromMethods_failOnNull() { + assertThatThrownBy(() -> ContentStreamProvider.fromByteArray(null)).isInstanceOf(NullPointerException.class); + assertThatThrownBy(() -> ContentStreamProvider.fromByteArrayUnsafe(null)).isInstanceOf(NullPointerException.class); + assertThatThrownBy(() -> ContentStreamProvider.fromString("foo", null)).isInstanceOf(NullPointerException.class); + assertThatThrownBy(() -> ContentStreamProvider.fromString(null, StandardCharsets.UTF_8)).isInstanceOf(NullPointerException.class); + assertThatThrownBy(() -> ContentStreamProvider.fromUtf8String(null)).isInstanceOf(NullPointerException.class); + assertThatThrownBy(() -> ContentStreamProvider.fromInputStream(null)).isInstanceOf(NullPointerException.class); + assertThatThrownBy(() -> ContentStreamProvider.fromInputStreamSupplier(null)).isInstanceOf(NullPointerException.class); + } + + @Test + void fromByteArray_containsInputBytes() throws IOException { + byte[] bytes = "foo".getBytes(); + ContentStreamProvider provider = ContentStreamProvider.fromByteArray(bytes); + assertArrayEquals(bytes, IoUtils.toByteArray(provider.newStream())); + assertArrayEquals(bytes, IoUtils.toByteArray(provider.newStream())); + } + + @Test + void fromByteArray_doesNotAllowModifyingInputBytes() throws IOException { + byte[] bytes = "foo".getBytes(); + byte[] bytesCopy = Arrays.copyOf(bytes, bytes.length); + + ContentStreamProvider provider = ContentStreamProvider.fromByteArray(bytes); + assertArrayEquals(bytes, IoUtils.toByteArray(provider.newStream())); + bytes[0] = 'b'; + assertArrayEquals(bytesCopy, IoUtils.toByteArray(provider.newStream())); + } + + @Test + void fromByteArrayUnsafe_containsInputBytes() throws IOException { + byte[] bytes = "foo".getBytes(); + ContentStreamProvider provider = ContentStreamProvider.fromByteArray(bytes); + assertArrayEquals(bytes, IoUtils.toByteArray(provider.newStream())); + assertArrayEquals(bytes, IoUtils.toByteArray(provider.newStream())); + } + + @Test + void fromByteArrayUnsafe_doesNotProtectAgainstModifyingInputBytes() throws IOException { + byte[] bytes = "foo".getBytes(); + + ContentStreamProvider provider = ContentStreamProvider.fromByteArrayUnsafe(bytes); + assertArrayEquals(bytes, IoUtils.toByteArray(provider.newStream())); + bytes[0] = 'b'; + assertArrayEquals(bytes, IoUtils.toByteArray(provider.newStream())); + } + + @Test + void fromString_containsInputBytes() throws IOException { + String str = "foo"; + ContentStreamProvider provider = ContentStreamProvider.fromString(str, StandardCharsets.UTF_8); + assertEquals(str, IoUtils.toUtf8String(provider.newStream())); + assertEquals(str, IoUtils.toUtf8String(provider.newStream())); + } + + @Test + void fromString_honorsEncoding() throws IOException { + String str = "\uD83D\uDE0A"; + ContentStreamProvider asciiProvider = ContentStreamProvider.fromString(str, StandardCharsets.US_ASCII); + ContentStreamProvider utf8Provider = ContentStreamProvider.fromString(str, StandardCharsets.UTF_8); + assertArrayEquals("?".getBytes(StandardCharsets.US_ASCII), IoUtils.toByteArray(asciiProvider.newStream())); + assertArrayEquals("\uD83D\uDE0A".getBytes(StandardCharsets.UTF_8), IoUtils.toByteArray(utf8Provider.newStream())); + } + + @Test + void fromUtf8String_containsInputBytes() throws IOException { + String str = "foo"; + ContentStreamProvider provider = ContentStreamProvider.fromUtf8String(str); + assertEquals(str, IoUtils.toUtf8String(provider.newStream())); + assertEquals(str, IoUtils.toUtf8String(provider.newStream())); + } + + @Test + void fromInputStream_containsInputBytes() throws IOException { + String str = "foo"; + ContentStreamProvider provider = ContentStreamProvider.fromInputStream(new StringInputStream(str)); + assertEquals(str, IoUtils.toUtf8String(provider.newStream())); + assertEquals(str, IoUtils.toUtf8String(provider.newStream())); + } + + @Test + void fromInputStream_failsOnSecondNewStream_ifInputStreamDoesNotSupportMarkAndReset() { + InputStream stream = new InputStream() { + @Override + public int read() { + return 0; + } + }; + + ContentStreamProvider provider = ContentStreamProvider.fromInputStream(stream); + provider.newStream(); + assertThatThrownBy(provider::newStream).isInstanceOf(IllegalStateException.class) + .hasMessageContaining("reset"); + } + + @Test + void fromInputStream_marksStream() throws IOException { + InputStream stream = Mockito.mock(InputStream.class); + Mockito.when(stream.markSupported()).thenReturn(true); + + ContentStreamProvider provider = ContentStreamProvider.fromInputStream(stream); + provider.newStream().read(); + Mockito.verify(stream, Mockito.atLeastOnce()).mark(Mockito.anyInt()); + } + + @Test + void fromInputStream_doesNotCloseProvidedResettableStream() throws IOException { + InputStream stream = Mockito.mock(InputStream.class); + Mockito.when(stream.markSupported()).thenReturn(true); + + ContentStreamProvider provider = ContentStreamProvider.fromInputStream(stream); + provider.newStream().read(); + provider.newStream().read(); + Mockito.verify(stream, Mockito.never()).close(); + } + + @Test + void fromInputStream_doesNotCloseProvidedSingleUseStream() throws IOException { + InputStream stream = Mockito.mock(InputStream.class); + Mockito.when(stream.markSupported()).thenReturn(false); + + ContentStreamProvider provider = ContentStreamProvider.fromInputStream(stream); + provider.newStream().read(); + Mockito.verify(stream, Mockito.never()).close(); + } + + @Test + void fromInputStreamSupplier_containsInputBytes() throws IOException { + String str = "foo"; + ContentStreamProvider provider = ContentStreamProvider.fromInputStreamSupplier(() -> new StringInputStream(str)); + assertEquals(str, IoUtils.toUtf8String(provider.newStream())); + assertEquals(str, IoUtils.toUtf8String(provider.newStream())); + } + + @Test + void fromInputStreamSupplier_closesStreams() throws IOException { + InputStream stream1 = Mockito.mock(InputStream.class); + InputStream stream2 = Mockito.mock(InputStream.class); + Supplier<InputStream> streamSupplier = Mockito.mock(Supplier.class); + + Mockito.when(streamSupplier.get()).thenReturn(stream1, stream2); + + ContentStreamProvider provider = ContentStreamProvider.fromInputStreamSupplier(streamSupplier); + + provider.newStream(); + + Mockito.verify(stream1, Mockito.never()).close(); + Mockito.verify(stream2, Mockito.never()).close(); + + provider.newStream(); + + Mockito.verify(stream1, Mockito.times(1)).close(); + Mockito.verify(stream2, Mockito.never()).close(); + } +} \ No newline at end of file diff --git a/http-clients/apache-client/pom.xml b/http-clients/apache-client/pom.xml index 9b4e923a9f84..e1e861508649 100644 --- a/http-clients/apache-client/pom.xml +++ b/http-clients/apache-client/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>http-clients</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>apache-client</artifactId> diff --git a/http-clients/aws-crt-client/pom.xml b/http-clients/aws-crt-client/pom.xml index 07a4759d8bc0..05c8a7f9976c 100644 --- a/http-clients/aws-crt-client/pom.xml +++ b/http-clients/aws-crt-client/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>http-clients</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/http-clients/netty-nio-client/pom.xml b/http-clients/netty-nio-client/pom.xml index 0e69d21b5860..66114ab57c07 100644 --- a/http-clients/netty-nio-client/pom.xml +++ b/http-clients/netty-nio-client/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>http-clients</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/http-clients/pom.xml b/http-clients/pom.xml index 36a1d9271264..37ac300fa3e9 100644 --- a/http-clients/pom.xml +++ b/http-clients/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml index 47f9f6844ef5..ba71c0bbbd72 100644 --- a/http-clients/url-connection-client/pom.xml +++ b/http-clients/url-connection-client/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>http-clients</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/metric-publishers/cloudwatch-metric-publisher/pom.xml b/metric-publishers/cloudwatch-metric-publisher/pom.xml index 0cc5950f6fed..a1030e46cadd 100644 --- a/metric-publishers/cloudwatch-metric-publisher/pom.xml +++ b/metric-publishers/cloudwatch-metric-publisher/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>metric-publishers</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cloudwatch-metric-publisher</artifactId> diff --git a/metric-publishers/pom.xml b/metric-publishers/pom.xml index b0883e8c10aa..2a082280295d 100644 --- a/metric-publishers/pom.xml +++ b/metric-publishers/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>metric-publishers</artifactId> diff --git a/pom.xml b/pom.xml index ad105c926130..1c1357548623 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <packaging>pom</packaging> <name>AWS Java SDK :: Parent</name> <description>The Amazon Web Services SDK for Java provides Java APIs @@ -97,7 +97,7 @@ </scm> <properties> <awsjavasdk.version>${project.version}</awsjavasdk.version> - <awsjavasdk.previous.version>2.25.66</awsjavasdk.previous.version> + <awsjavasdk.previous.version>2.25.69</awsjavasdk.previous.version> <jackson.version>2.15.2</jackson.version> <jackson.databind.version>2.15.2</jackson.databind.version> <jacksonjr.version>2.13.2</jacksonjr.version> @@ -180,7 +180,7 @@ <reactive-streams.version>1.0.4</reactive-streams.version> <!-- S3 Access Grants plugin version --> - <s3accessgrants.version>2.0.1</s3accessgrants.version> + <s3accessgrants.version>2.1.0</s3accessgrants.version> <skip.unit.tests>${skipTests}</skip.unit.tests> <integTestSourceDirectory>${project.basedir}/src/it/java</integTestSourceDirectory> diff --git a/release-scripts/pom.xml b/release-scripts/pom.xml index 100966a6783d..5f342309cc34 100644 --- a/release-scripts/pom.xml +++ b/release-scripts/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> <artifactId>release-scripts</artifactId> diff --git a/services-custom/dynamodb-enhanced/pom.xml b/services-custom/dynamodb-enhanced/pom.xml index 85dc74267136..839015abf7f6 100644 --- a/services-custom/dynamodb-enhanced/pom.xml +++ b/services-custom/dynamodb-enhanced/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services-custom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>dynamodb-enhanced</artifactId> <name>AWS Java SDK :: DynamoDB :: Enhanced Client</name> diff --git a/services-custom/iam-policy-builder/pom.xml b/services-custom/iam-policy-builder/pom.xml index d3a24a6e9424..3124f1e5a5bf 100644 --- a/services-custom/iam-policy-builder/pom.xml +++ b/services-custom/iam-policy-builder/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>iam-policy-builder</artifactId> diff --git a/services-custom/pom.xml b/services-custom/pom.xml index 9a7bb81a826a..1d7d98feb506 100644 --- a/services-custom/pom.xml +++ b/services-custom/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>services-custom</artifactId> <name>AWS Java SDK :: Custom Services</name> diff --git a/services-custom/s3-event-notifications/pom.xml b/services-custom/s3-event-notifications/pom.xml index b53bd91a0cf5..0506921baa2b 100644 --- a/services-custom/s3-event-notifications/pom.xml +++ b/services-custom/s3-event-notifications/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>s3-event-notifications</artifactId> diff --git a/services-custom/s3-transfer-manager/pom.xml b/services-custom/s3-transfer-manager/pom.xml index 82b099c41b23..a6965b550f49 100644 --- a/services-custom/s3-transfer-manager/pom.xml +++ b/services-custom/s3-transfer-manager/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>s3-transfer-manager</artifactId> diff --git a/services/accessanalyzer/pom.xml b/services/accessanalyzer/pom.xml index dc5e21ea5087..608151022710 100644 --- a/services/accessanalyzer/pom.xml +++ b/services/accessanalyzer/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>accessanalyzer</artifactId> <name>AWS Java SDK :: Services :: AccessAnalyzer</name> diff --git a/services/account/pom.xml b/services/account/pom.xml index e24ab41ad400..7cb323e890f0 100644 --- a/services/account/pom.xml +++ b/services/account/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>account</artifactId> <name>AWS Java SDK :: Services :: Account</name> diff --git a/services/account/src/main/resources/codegen-resources/endpoint-rule-set.json b/services/account/src/main/resources/codegen-resources/endpoint-rule-set.json index 88e9002a1f6a..8f8a08191d9a 100644 --- a/services/account/src/main/resources/codegen-resources/endpoint-rule-set.json +++ b/services/account/src/main/resources/codegen-resources/endpoint-rule-set.json @@ -40,7 +40,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -83,7 +82,8 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [ @@ -96,7 +96,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -110,7 +109,6 @@ "assign": "PartitionResult" } ], - "type": "tree", "rules": [ { "conditions": [ @@ -235,7 +233,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -270,7 +267,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [], @@ -281,14 +277,16 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [], "error": "FIPS and DualStack are enabled, but this partition does not support one or both", "type": "error" } - ] + ], + "type": "tree" }, { "conditions": [ @@ -302,14 +300,12 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ { "fn": "booleanEquals", "argv": [ - true, { "fn": "getAttr", "argv": [ @@ -318,11 +314,11 @@ }, "supportsFIPS" ] - } + }, + true ] } ], - "type": "tree", "rules": [ { "conditions": [], @@ -333,14 +329,16 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [], "error": "FIPS is enabled but this partition does not support FIPS", "type": "error" } - ] + ], + "type": "tree" }, { "conditions": [ @@ -354,7 +352,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -374,7 +371,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [], @@ -385,14 +381,16 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [], "error": "DualStack is enabled but this partition does not support DualStack", "type": "error" } - ] + ], + "type": "tree" }, { "conditions": [], @@ -403,9 +401,11 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" } - ] + ], + "type": "tree" }, { "conditions": [], diff --git a/services/account/src/main/resources/codegen-resources/service-2.json b/services/account/src/main/resources/codegen-resources/service-2.json index 65ba47afbbcb..5620b7d1c0fa 100644 --- a/services/account/src/main/resources/codegen-resources/service-2.json +++ b/services/account/src/main/resources/codegen-resources/service-2.json @@ -12,6 +12,25 @@ "uid":"account-2021-02-01" }, "operations":{ + "AcceptPrimaryEmailUpdate":{ + "name":"AcceptPrimaryEmailUpdate", + "http":{ + "method":"POST", + "requestUri":"/acceptPrimaryEmailUpdate", + "responseCode":200 + }, + "input":{"shape":"AcceptPrimaryEmailUpdateRequest"}, + "output":{"shape":"AcceptPrimaryEmailUpdateResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"ValidationException"}, + {"shape":"ConflictException"}, + {"shape":"AccessDeniedException"}, + {"shape":"TooManyRequestsException"}, + {"shape":"InternalServerException"} + ], + "documentation":"<p>Accepts the request that originated from <a>StartPrimaryEmailUpdate</a> to update the primary email address (also known as the root user email address) for the specified account.</p>" + }, "DeleteAlternateContact":{ "name":"DeleteAlternateContact", "http":{ @@ -45,7 +64,7 @@ {"shape":"TooManyRequestsException"}, {"shape":"InternalServerException"} ], - "documentation":"<p>Disables (opts-out) a particular Region for an account.</p>" + "documentation":"<p>Disables (opts-out) a particular Region for an account.</p> <note> <p>The act of disabling a Region will remove all IAM access to any resources that reside in that Region.</p> </note>" }, "EnableRegion":{ "name":"EnableRegion", @@ -100,6 +119,24 @@ ], "documentation":"<p>Retrieves the primary contact information of an Amazon Web Services account.</p> <p>For complete details about how to use the primary contact operations, see <a href=\"https://docs.aws.amazon.com/accounts/latest/reference/manage-acct-update-contact.html\">Update the primary and alternate contact information</a>.</p>" }, + "GetPrimaryEmail":{ + "name":"GetPrimaryEmail", + "http":{ + "method":"POST", + "requestUri":"/getPrimaryEmail", + "responseCode":200 + }, + "input":{"shape":"GetPrimaryEmailRequest"}, + "output":{"shape":"GetPrimaryEmailResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"ValidationException"}, + {"shape":"AccessDeniedException"}, + {"shape":"TooManyRequestsException"}, + {"shape":"InternalServerException"} + ], + "documentation":"<p>Retrieves the primary email address for the specified account.</p>" + }, "GetRegionOptStatus":{ "name":"GetRegionOptStatus", "http":{ @@ -167,9 +204,59 @@ ], "documentation":"<p>Updates the primary contact information of an Amazon Web Services account.</p> <p>For complete details about how to use the primary contact operations, see <a href=\"https://docs.aws.amazon.com/accounts/latest/reference/manage-acct-update-contact.html\">Update the primary and alternate contact information</a>.</p>", "idempotent":true + }, + "StartPrimaryEmailUpdate":{ + "name":"StartPrimaryEmailUpdate", + "http":{ + "method":"POST", + "requestUri":"/startPrimaryEmailUpdate", + "responseCode":200 + }, + "input":{"shape":"StartPrimaryEmailUpdateRequest"}, + "output":{"shape":"StartPrimaryEmailUpdateResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"ValidationException"}, + {"shape":"ConflictException"}, + {"shape":"AccessDeniedException"}, + {"shape":"TooManyRequestsException"}, + {"shape":"InternalServerException"} + ], + "documentation":"<p>Starts the process to update the primary email address for the specified account.</p>" } }, "shapes":{ + "AcceptPrimaryEmailUpdateRequest":{ + "type":"structure", + "required":[ + "AccountId", + "Otp", + "PrimaryEmail" + ], + "members":{ + "AccountId":{ + "shape":"AccountId", + "documentation":"<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access or modify with this operation. To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account. The specified account ID must be a member account in the same organization. The organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account assigned.</p> <p>This operation can only be called from the management account or the delegated administrator account of an organization for a member account.</p> <note> <p>The management account can't specify its own <code>AccountId</code>.</p> </note>" + }, + "Otp":{ + "shape":"Otp", + "documentation":"<p>The OTP code sent to the <code>PrimaryEmail</code> specified on the <code>StartPrimaryEmailUpdate</code> API call.</p>" + }, + "PrimaryEmail":{ + "shape":"PrimaryEmailAddress", + "documentation":"<p>The new primary email address for use with the specified account. This must match the <code>PrimaryEmail</code> from the <code>StartPrimaryEmailUpdate</code> API call.</p>" + } + } + }, + "AcceptPrimaryEmailUpdateResponse":{ + "type":"structure", + "members":{ + "Status":{ + "shape":"PrimaryEmailUpdateStatus", + "documentation":"<p>Retrieves the status of the accepted primary email update request.</p>" + } + } + }, "AccessDeniedException":{ "type":"structure", "required":["message"], @@ -305,7 +392,7 @@ }, "StateOrRegion":{ "shape":"StateOrRegion", - "documentation":"<p>The state or region of the primary contact address. This field is required in selected countries.</p>" + "documentation":"<p>The state or region of the primary contact address. If the mailing address is within the United States (US), the value in this field can be either a two character state code (for example, <code>NJ</code>) or the full state name (for example, <code>New Jersey</code>). This field is required in the following countries: <code>US</code>, <code>CA</code>, <code>GB</code>, <code>DE</code>, <code>JP</code>, <code>IN</code>, and <code>BR</code>.</p>" }, "WebsiteUrl":{ "shape":"WebsiteUrl", @@ -347,7 +434,7 @@ "members":{ "AccountId":{ "shape":"AccountId", - "documentation":"<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access or modify with this operation. If you don't specify this parameter, it defaults to the Amazon Web Services account of the identity used to call the operation. To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account. The specified account ID must also be a member account in the same organization. The organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account assigned.</p> <note> <p>The management account can't specify its own <code>AccountId</code>. It must call the operation in standalone context by not including the <code>AccountId</code> parameter.</p> </note> <p>To call this operation on an account that is not a member of an organization, don't specify this parameter. Instead, call the operation using an identity belonging to the account whose contacts you wish to retrieve or modify.</p>" + "documentation":"<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access or modify with this operation. If you don't specify this parameter, it defaults to the Amazon Web Services account of the identity used to call the operation. To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account. The specified account ID must be a member account in the same organization. The organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account assigned.</p> <note> <p>The management account can't specify its own <code>AccountId</code>. It must call the operation in standalone context by not including the <code>AccountId</code> parameter.</p> </note> <p>To call this operation on an account that is not a member of an organization, don't specify this parameter. Instead, call the operation using an identity belonging to the account whose contacts you wish to retrieve or modify.</p>" }, "RegionName":{ "shape":"RegionName", @@ -374,7 +461,7 @@ "members":{ "AccountId":{ "shape":"AccountId", - "documentation":"<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access or modify with this operation. If you don't specify this parameter, it defaults to the Amazon Web Services account of the identity used to call the operation. To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account. The specified account ID must also be a member account in the same organization. The organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account assigned.</p> <note> <p>The management account can't specify its own <code>AccountId</code>. It must call the operation in standalone context by not including the <code>AccountId</code> parameter.</p> </note> <p>To call this operation on an account that is not a member of an organization, don't specify this parameter. Instead, call the operation using an identity belonging to the account whose contacts you wish to retrieve or modify.</p>" + "documentation":"<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access or modify with this operation. If you don't specify this parameter, it defaults to the Amazon Web Services account of the identity used to call the operation. To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account. The specified account ID must be a member account in the same organization. The organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account assigned.</p> <note> <p>The management account can't specify its own <code>AccountId</code>. It must call the operation in standalone context by not including the <code>AccountId</code> parameter.</p> </note> <p>To call this operation on an account that is not a member of an organization, don't specify this parameter. Instead, call the operation using an identity belonging to the account whose contacts you wish to retrieve or modify.</p>" }, "RegionName":{ "shape":"RegionName", @@ -416,7 +503,7 @@ "members":{ "AccountId":{ "shape":"AccountId", - "documentation":"<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access or modify with this operation. If you don't specify this parameter, it defaults to the Amazon Web Services account of the identity used to call the operation. To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account. The specified account ID must also be a member account in the same organization. The organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account assigned.</p> <note> <p>The management account can't specify its own <code>AccountId</code>. It must call the operation in standalone context by not including the <code>AccountId</code> parameter.</p> </note> <p>To call this operation on an account that is not a member of an organization, don't specify this parameter. Instead, call the operation using an identity belonging to the account whose contacts you wish to retrieve or modify.</p>" + "documentation":"<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access or modify with this operation. If you don't specify this parameter, it defaults to the Amazon Web Services account of the identity used to call the operation. To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account. The specified account ID must be a member account in the same organization. The organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account assigned.</p> <note> <p>The management account can't specify its own <code>AccountId</code>. It must call the operation in standalone context by not including the <code>AccountId</code> parameter.</p> </note> <p>To call this operation on an account that is not a member of an organization, don't specify this parameter. Instead, call the operation using an identity belonging to the account whose contacts you wish to retrieve or modify.</p>" } } }, @@ -429,13 +516,32 @@ } } }, + "GetPrimaryEmailRequest":{ + "type":"structure", + "required":["AccountId"], + "members":{ + "AccountId":{ + "shape":"AccountId", + "documentation":"<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access or modify with this operation. To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account. The specified account ID must be a member account in the same organization. The organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account assigned.</p> <p>This operation can only be called from the management account or the delegated administrator account of an organization for a member account.</p> <note> <p>The management account can't specify its own <code>AccountId</code>.</p> </note>" + } + } + }, + "GetPrimaryEmailResponse":{ + "type":"structure", + "members":{ + "PrimaryEmail":{ + "shape":"PrimaryEmailAddress", + "documentation":"<p>Retrieves the primary email address associated with the specified account.</p>" + } + } + }, "GetRegionOptStatusRequest":{ "type":"structure", "required":["RegionName"], "members":{ "AccountId":{ "shape":"AccountId", - "documentation":"<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access or modify with this operation. If you don't specify this parameter, it defaults to the Amazon Web Services account of the identity used to call the operation. To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account. The specified account ID must also be a member account in the same organization. The organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account assigned.</p> <note> <p>The management account can't specify its own <code>AccountId</code>. It must call the operation in standalone context by not including the <code>AccountId</code> parameter.</p> </note> <p>To call this operation on an account that is not a member of an organization, don't specify this parameter. Instead, call the operation using an identity belonging to the account whose contacts you wish to retrieve or modify.</p>" + "documentation":"<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access or modify with this operation. If you don't specify this parameter, it defaults to the Amazon Web Services account of the identity used to call the operation. To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account. The specified account ID must be a member account in the same organization. The organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account assigned.</p> <note> <p>The management account can't specify its own <code>AccountId</code>. It must call the operation in standalone context by not including the <code>AccountId</code> parameter.</p> </note> <p>To call this operation on an account that is not a member of an organization, don't specify this parameter. Instead, call the operation using an identity belonging to the account whose contacts you wish to retrieve or modify.</p>" }, "RegionName":{ "shape":"RegionName", @@ -473,7 +579,7 @@ "members":{ "AccountId":{ "shape":"AccountId", - "documentation":"<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access or modify with this operation. If you don't specify this parameter, it defaults to the Amazon Web Services account of the identity used to call the operation. To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account. The specified account ID must also be a member account in the same organization. The organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account assigned.</p> <note> <p>The management account can't specify its own <code>AccountId</code>. It must call the operation in standalone context by not including the <code>AccountId</code> parameter.</p> </note> <p>To call this operation on an account that is not a member of an organization, don't specify this parameter. Instead, call the operation using an identity belonging to the account whose contacts you wish to retrieve or modify.</p>" + "documentation":"<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access or modify with this operation. If you don't specify this parameter, it defaults to the Amazon Web Services account of the identity used to call the operation. To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account. The specified account ID must be a member account in the same organization. The organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account assigned.</p> <note> <p>The management account can't specify its own <code>AccountId</code>. It must call the operation in standalone context by not including the <code>AccountId</code> parameter.</p> </note> <p>To call this operation on an account that is not a member of an organization, don't specify this parameter. Instead, call the operation using an identity belonging to the account whose contacts you wish to retrieve or modify.</p>" }, "MaxResults":{ "shape":"ListRegionsRequestMaxResultsInteger", @@ -519,6 +625,11 @@ "min":1, "sensitive":true }, + "Otp":{ + "type":"string", + "pattern":"^[a-zA-Z0-9]{6}$", + "sensitive":true + }, "PhoneNumber":{ "type":"string", "max":25, @@ -532,6 +643,19 @@ "min":1, "sensitive":true }, + "PrimaryEmailAddress":{ + "type":"string", + "max":64, + "min":5, + "sensitive":true + }, + "PrimaryEmailUpdateStatus":{ + "type":"string", + "enum":[ + "PENDING", + "ACCEPTED" + ] + }, "PutAlternateContactRequest":{ "type":"structure", "required":[ @@ -574,7 +698,7 @@ "members":{ "AccountId":{ "shape":"AccountId", - "documentation":"<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access or modify with this operation. If you don't specify this parameter, it defaults to the Amazon Web Services account of the identity used to call the operation. To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account. The specified account ID must also be a member account in the same organization. The organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account assigned.</p> <note> <p>The management account can't specify its own <code>AccountId</code>. It must call the operation in standalone context by not including the <code>AccountId</code> parameter.</p> </note> <p>To call this operation on an account that is not a member of an organization, don't specify this parameter. Instead, call the operation using an identity belonging to the account whose contacts you wish to retrieve or modify.</p>" + "documentation":"<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access or modify with this operation. If you don't specify this parameter, it defaults to the Amazon Web Services account of the identity used to call the operation. To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account. The specified account ID must be a member account in the same organization. The organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account assigned.</p> <note> <p>The management account can't specify its own <code>AccountId</code>. It must call the operation in standalone context by not including the <code>AccountId</code> parameter.</p> </note> <p>To call this operation on an account that is not a member of an organization, don't specify this parameter. Instead, call the operation using an identity belonging to the account whose contacts you wish to retrieve or modify.</p>" }, "ContactInformation":{ "shape":"ContactInformation", @@ -636,6 +760,32 @@ "type":"string", "sensitive":true }, + "StartPrimaryEmailUpdateRequest":{ + "type":"structure", + "required":[ + "AccountId", + "PrimaryEmail" + ], + "members":{ + "AccountId":{ + "shape":"AccountId", + "documentation":"<p>Specifies the 12-digit account ID number of the Amazon Web Services account that you want to access or modify with this operation. To use this parameter, the caller must be an identity in the <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_getting-started_concepts.html#account\">organization's management account</a> or a delegated administrator account. The specified account ID must be a member account in the same organization. The organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/orgs_manage_org_support-all-features.html\">all features enabled</a>, and the organization must have <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-trusted-access.html\">trusted access</a> enabled for the Account Management service, and optionally a <a href=\"https://docs.aws.amazon.com/organizations/latest/userguide/using-orgs-delegated-admin.html\">delegated admin</a> account assigned.</p> <p>This operation can only be called from the management account or the delegated administrator account of an organization for a member account.</p> <note> <p>The management account can't specify its own <code>AccountId</code>.</p> </note>" + }, + "PrimaryEmail":{ + "shape":"PrimaryEmailAddress", + "documentation":"<p>The new primary email address (also known as the root user email address) to use in the specified account.</p>" + } + } + }, + "StartPrimaryEmailUpdateResponse":{ + "type":"structure", + "members":{ + "Status":{ + "shape":"PrimaryEmailUpdateStatus", + "documentation":"<p>The status of the primary email update request.</p>" + } + } + }, "StateOrRegion":{ "type":"string", "max":50, diff --git a/services/acm/pom.xml b/services/acm/pom.xml index 4ed3136428b8..66d1bef58f5c 100644 --- a/services/acm/pom.xml +++ b/services/acm/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>acm</artifactId> <name>AWS Java SDK :: Services :: AWS Certificate Manager</name> diff --git a/services/acmpca/pom.xml b/services/acmpca/pom.xml index d1db82110bf0..d03cff232846 100644 --- a/services/acmpca/pom.xml +++ b/services/acmpca/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>acmpca</artifactId> <name>AWS Java SDK :: Services :: ACM PCA</name> diff --git a/services/amp/pom.xml b/services/amp/pom.xml index b30c6e5b290a..57261b20607f 100644 --- a/services/amp/pom.xml +++ b/services/amp/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>amp</artifactId> <name>AWS Java SDK :: Services :: Amp</name> diff --git a/services/amplify/pom.xml b/services/amplify/pom.xml index faf8476d85e9..4cb9422a86a2 100644 --- a/services/amplify/pom.xml +++ b/services/amplify/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>amplify</artifactId> <name>AWS Java SDK :: Services :: Amplify</name> diff --git a/services/amplifybackend/pom.xml b/services/amplifybackend/pom.xml index 413a66a0a05a..49923be09ddb 100644 --- a/services/amplifybackend/pom.xml +++ b/services/amplifybackend/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>amplifybackend</artifactId> <name>AWS Java SDK :: Services :: Amplify Backend</name> diff --git a/services/amplifyuibuilder/pom.xml b/services/amplifyuibuilder/pom.xml index fcc56e191ee5..4ac9b010d415 100644 --- a/services/amplifyuibuilder/pom.xml +++ b/services/amplifyuibuilder/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>amplifyuibuilder</artifactId> <name>AWS Java SDK :: Services :: Amplify UI Builder</name> diff --git a/services/apigateway/pom.xml b/services/apigateway/pom.xml index 6108463dd0b5..42fd1b5405a7 100644 --- a/services/apigateway/pom.xml +++ b/services/apigateway/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>apigateway</artifactId> <name>AWS Java SDK :: Services :: Amazon API Gateway</name> diff --git a/services/apigatewaymanagementapi/pom.xml b/services/apigatewaymanagementapi/pom.xml index c4cb1aff0109..52cf523d5c77 100644 --- a/services/apigatewaymanagementapi/pom.xml +++ b/services/apigatewaymanagementapi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>apigatewaymanagementapi</artifactId> <name>AWS Java SDK :: Services :: ApiGatewayManagementApi</name> diff --git a/services/apigatewayv2/pom.xml b/services/apigatewayv2/pom.xml index 8077118dbc8b..00a548539d76 100644 --- a/services/apigatewayv2/pom.xml +++ b/services/apigatewayv2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>apigatewayv2</artifactId> <name>AWS Java SDK :: Services :: ApiGatewayV2</name> diff --git a/services/appconfig/pom.xml b/services/appconfig/pom.xml index 1c6848f1b71a..e9055107bd61 100644 --- a/services/appconfig/pom.xml +++ b/services/appconfig/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>appconfig</artifactId> <name>AWS Java SDK :: Services :: AppConfig</name> diff --git a/services/appconfigdata/pom.xml b/services/appconfigdata/pom.xml index 268f1a62d7e0..72808c86f7c6 100644 --- a/services/appconfigdata/pom.xml +++ b/services/appconfigdata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>appconfigdata</artifactId> <name>AWS Java SDK :: Services :: App Config Data</name> diff --git a/services/appfabric/pom.xml b/services/appfabric/pom.xml index 6baea64ae62c..ac3628001758 100644 --- a/services/appfabric/pom.xml +++ b/services/appfabric/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>appfabric</artifactId> <name>AWS Java SDK :: Services :: App Fabric</name> diff --git a/services/appflow/pom.xml b/services/appflow/pom.xml index 9c2ad2e4e157..d5214dab878e 100644 --- a/services/appflow/pom.xml +++ b/services/appflow/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>appflow</artifactId> <name>AWS Java SDK :: Services :: Appflow</name> diff --git a/services/appintegrations/pom.xml b/services/appintegrations/pom.xml index d73ce98587ad..10d192038772 100644 --- a/services/appintegrations/pom.xml +++ b/services/appintegrations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>appintegrations</artifactId> <name>AWS Java SDK :: Services :: App Integrations</name> diff --git a/services/applicationautoscaling/pom.xml b/services/applicationautoscaling/pom.xml index 1ddf8a90f20a..305730fd1e6d 100644 --- a/services/applicationautoscaling/pom.xml +++ b/services/applicationautoscaling/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>applicationautoscaling</artifactId> <name>AWS Java SDK :: Services :: AWS Application Auto Scaling</name> diff --git a/services/applicationcostprofiler/pom.xml b/services/applicationcostprofiler/pom.xml index a532e3e7342e..f2c1438b89f1 100644 --- a/services/applicationcostprofiler/pom.xml +++ b/services/applicationcostprofiler/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>applicationcostprofiler</artifactId> <name>AWS Java SDK :: Services :: Application Cost Profiler</name> diff --git a/services/applicationdiscovery/pom.xml b/services/applicationdiscovery/pom.xml index e987c8e952f3..588abacb8dd8 100644 --- a/services/applicationdiscovery/pom.xml +++ b/services/applicationdiscovery/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>applicationdiscovery</artifactId> <name>AWS Java SDK :: Services :: AWS Application Discovery Service</name> diff --git a/services/applicationinsights/pom.xml b/services/applicationinsights/pom.xml index eda636694382..2f79b8c4273e 100644 --- a/services/applicationinsights/pom.xml +++ b/services/applicationinsights/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>applicationinsights</artifactId> <name>AWS Java SDK :: Services :: Application Insights</name> diff --git a/services/appmesh/pom.xml b/services/appmesh/pom.xml index 703cd2738487..0bd806681953 100644 --- a/services/appmesh/pom.xml +++ b/services/appmesh/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>appmesh</artifactId> <name>AWS Java SDK :: Services :: App Mesh</name> diff --git a/services/apprunner/pom.xml b/services/apprunner/pom.xml index 77dfdb3f04e1..788c774be0a1 100644 --- a/services/apprunner/pom.xml +++ b/services/apprunner/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>apprunner</artifactId> <name>AWS Java SDK :: Services :: App Runner</name> diff --git a/services/appstream/pom.xml b/services/appstream/pom.xml index 355de6b5672f..7f47a07a452b 100644 --- a/services/appstream/pom.xml +++ b/services/appstream/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>appstream</artifactId> <name>AWS Java SDK :: Services :: Amazon AppStream</name> diff --git a/services/appsync/pom.xml b/services/appsync/pom.xml index d9562bdaa676..31aebe29e878 100644 --- a/services/appsync/pom.xml +++ b/services/appsync/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>appsync</artifactId> diff --git a/services/arczonalshift/pom.xml b/services/arczonalshift/pom.xml index 7118fea2942c..dbe56adef1af 100644 --- a/services/arczonalshift/pom.xml +++ b/services/arczonalshift/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>arczonalshift</artifactId> <name>AWS Java SDK :: Services :: ARC Zonal Shift</name> diff --git a/services/artifact/pom.xml b/services/artifact/pom.xml index 92d59bf457cb..1df7e671c39a 100644 --- a/services/artifact/pom.xml +++ b/services/artifact/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>artifact</artifactId> <name>AWS Java SDK :: Services :: Artifact</name> diff --git a/services/athena/pom.xml b/services/athena/pom.xml index fe49fe55824c..e373b62dca56 100644 --- a/services/athena/pom.xml +++ b/services/athena/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>athena</artifactId> <name>AWS Java SDK :: Services :: Amazon Athena</name> diff --git a/services/auditmanager/pom.xml b/services/auditmanager/pom.xml index 71866d0dbf73..a88fde997601 100644 --- a/services/auditmanager/pom.xml +++ b/services/auditmanager/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>auditmanager</artifactId> <name>AWS Java SDK :: Services :: Audit Manager</name> diff --git a/services/auditmanager/src/main/resources/codegen-resources/endpoint-rule-set.json b/services/auditmanager/src/main/resources/codegen-resources/endpoint-rule-set.json index b38eb1c9a64e..3208bdbf6a1f 100644 --- a/services/auditmanager/src/main/resources/codegen-resources/endpoint-rule-set.json +++ b/services/auditmanager/src/main/resources/codegen-resources/endpoint-rule-set.json @@ -40,7 +40,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -83,7 +82,8 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [ @@ -96,7 +96,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -110,7 +109,6 @@ "assign": "PartitionResult" } ], - "type": "tree", "rules": [ { "conditions": [ @@ -133,7 +131,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -168,7 +165,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [], @@ -179,14 +175,16 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [], "error": "FIPS and DualStack are enabled, but this partition does not support one or both", "type": "error" } - ] + ], + "type": "tree" }, { "conditions": [ @@ -200,14 +198,12 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ { "fn": "booleanEquals", "argv": [ - true, { "fn": "getAttr", "argv": [ @@ -216,11 +212,11 @@ }, "supportsFIPS" ] - } + }, + true ] } ], - "type": "tree", "rules": [ { "conditions": [], @@ -231,14 +227,16 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [], "error": "FIPS is enabled but this partition does not support FIPS", "type": "error" } - ] + ], + "type": "tree" }, { "conditions": [ @@ -252,7 +250,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [ @@ -272,7 +269,6 @@ ] } ], - "type": "tree", "rules": [ { "conditions": [], @@ -283,14 +279,16 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" }, { "conditions": [], "error": "DualStack is enabled but this partition does not support DualStack", "type": "error" } - ] + ], + "type": "tree" }, { "conditions": [], @@ -301,9 +299,11 @@ }, "type": "endpoint" } - ] + ], + "type": "tree" } - ] + ], + "type": "tree" }, { "conditions": [], diff --git a/services/auditmanager/src/main/resources/codegen-resources/service-2.json b/services/auditmanager/src/main/resources/codegen-resources/service-2.json index eb086df6fe6f..4ad7117fab91 100644 --- a/services/auditmanager/src/main/resources/codegen-resources/service-2.json +++ b/services/auditmanager/src/main/resources/codegen-resources/service-2.json @@ -122,7 +122,8 @@ {"shape":"ValidationException"}, {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"}, - {"shape":"ServiceQuotaExceededException"} + {"shape":"ServiceQuotaExceededException"}, + {"shape":"ThrottlingException"} ], "documentation":"<p> Creates an assessment in Audit Manager. </p>" }, @@ -567,7 +568,7 @@ {"shape":"ValidationException"}, {"shape":"InternalServerException"} ], - "documentation":"<p>Gets a list of all of the Amazon Web Services that you can choose to include in your assessment. When you <a href=\"https://docs.aws.amazon.com/audit-manager/latest/APIReference/API_CreateAssessment.html\">create an assessment</a>, specify which of these services you want to include to narrow the assessment's <a href=\"https://docs.aws.amazon.com/audit-manager/latest/APIReference/API_Scope.html\">scope</a>.</p>" + "documentation":"<p>Gets a list of the Amazon Web Services from which Audit Manager can collect evidence. </p> <p>Audit Manager defines which Amazon Web Services are in scope for an assessment. Audit Manager infers this scope by examining the assessment’s controls and their data sources, and then mapping this information to one or more of the corresponding Amazon Web Services that are in this list.</p> <note> <p>For information about why it's no longer possible to specify services in scope manually, see <a href=\"https://docs.aws.amazon.com/audit-manager/latest/userguide/evidence-collection-issues.html#unable-to-edit-services\">I can't edit the services in scope for my assessment</a> in the <i>Troubleshooting</i> section of the Audit Manager user guide.</p> </note>" }, "GetSettings":{ "name":"GetSettings", @@ -673,7 +674,7 @@ {"shape":"InternalServerException"}, {"shape":"ValidationException"} ], - "documentation":"<p>Lists the latest analytics data for control domains across all of your active assessments. </p> <note> <p>A control domain is listed only if at least one of the controls within that domain collected evidence on the <code>lastUpdated</code> date of <code>controlDomainInsights</code>. If this condition isn’t met, no data is listed for that control domain.</p> </note>" + "documentation":"<p>Lists the latest analytics data for control domains across all of your active assessments. </p> <p>Audit Manager supports the control domains that are provided by Amazon Web Services Control Catalog. For information about how to find a list of available control domains, see <a href=\"https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListDomains.html\"> <code>ListDomains</code> </a> in the Amazon Web Services Control Catalog API Reference.</p> <note> <p>A control domain is listed only if at least one of the controls within that domain collected evidence on the <code>lastUpdated</code> date of <code>controlDomainInsights</code>. If this condition isn’t met, no data is listed for that control domain.</p> </note>" }, "ListControlDomainInsightsByAssessment":{ "name":"ListControlDomainInsightsByAssessment", @@ -689,7 +690,7 @@ {"shape":"AccessDeniedException"}, {"shape":"InternalServerException"} ], - "documentation":"<p>Lists analytics data for control domains within a specified active assessment.</p> <note> <p>A control domain is listed only if at least one of the controls within that domain collected evidence on the <code>lastUpdated</code> date of <code>controlDomainInsights</code>. If this condition isn’t met, no data is listed for that domain.</p> </note>" + "documentation":"<p>Lists analytics data for control domains within a specified active assessment.</p> <p>Audit Manager supports the control domains that are provided by Amazon Web Services Control Catalog. For information about how to find a list of available control domains, see <a href=\"https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListDomains.html\"> <code>ListDomains</code> </a> in the Amazon Web Services Control Catalog API Reference.</p> <note> <p>A control domain is listed only if at least one of the controls within that domain collected evidence on the <code>lastUpdated</code> date of <code>controlDomainInsights</code>. If this condition isn’t met, no data is listed for that domain.</p> </note>" }, "ListControlInsightsByControlDomain":{ "name":"ListControlInsightsByControlDomain", @@ -735,7 +736,7 @@ {"shape":"ValidationException"}, {"shape":"InternalServerException"} ], - "documentation":"<p> Returns a list of keywords that are pre-mapped to the specified control data source. </p>" + "documentation":"<p>Returns a list of keywords that are pre-mapped to the specified control data source.</p>" }, "ListNotifications":{ "name":"ListNotifications", @@ -858,7 +859,8 @@ {"shape":"ResourceNotFoundException"}, {"shape":"ValidationException"}, {"shape":"AccessDeniedException"}, - {"shape":"InternalServerException"} + {"shape":"InternalServerException"}, + {"shape":"ThrottlingException"} ], "documentation":"<p> Edits an Audit Manager assessment. </p>" }, @@ -2073,10 +2075,20 @@ "tags":{ "shape":"TagMap", "documentation":"<p> The tags associated with the control. </p>" + }, + "state":{ + "shape":"ControlState", + "documentation":"<p>The state of the control. The <code>END_OF_SUPPORT</code> state is applicable to standard controls only. This state indicates that the standard control can still be used to collect evidence, but Audit Manager is no longer updating or maintaining that control.</p>" } }, "documentation":"<p> A control in Audit Manager. </p>" }, + "ControlCatalogId":{ + "type":"string", + "max":2048, + "min":13, + "pattern":"^arn:.*:controlcatalog:.*|UNCATEGORIZED" + }, "ControlComment":{ "type":"structure", "members":{ @@ -2108,18 +2120,25 @@ "ControlDescription":{ "type":"string", "max":1000, - "pattern":"^[\\w\\W\\s\\S]*$" + "pattern":"^[\\w\\W\\s\\S]*$", + "sensitive":true + }, + "ControlDomainId":{ + "type":"string", + "max":2048, + "min":13, + "pattern":"^arn:.*:controlcatalog:.*:.*:domain/.*|UNCATEGORIZED|^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$" }, "ControlDomainInsights":{ "type":"structure", "members":{ "name":{ - "shape":"NonEmptyString", + "shape":"String", "documentation":"<p>The name of the control domain. </p>" }, "id":{ - "shape":"UUID", - "documentation":"<p>The unique identifier for the control domain. </p>" + "shape":"ControlDomainId", + "documentation":"<p>The unique identifier for the control domain. Audit Manager supports the control domains that are provided by Amazon Web Services Control Catalog. For information about how to find a list of available control domains, see <a href=\"https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListDomains.html\"> <code>ListDomains</code> </a> in the Amazon Web Services Control Catalog API Reference.</p>" }, "controlsCountByNoncompliantEvidence":{ "shape":"NullableInteger", @@ -2156,11 +2175,11 @@ "type":"structure", "members":{ "name":{ - "shape":"NonEmptyString", + "shape":"String", "documentation":"<p>The name of the assessment control. </p>" }, "id":{ - "shape":"UUID", + "shape":"ControlDomainId", "documentation":"<p>The unique identifier for the assessment control. </p>" }, "evidenceInsights":{ @@ -2182,11 +2201,11 @@ "type":"structure", "members":{ "name":{ - "shape":"NonEmptyString", + "shape":"String", "documentation":"<p>The name of the control. </p>" }, "id":{ - "shape":"UUID", + "shape":"ControlDomainId", "documentation":"<p>The unique identifier for the control. </p>" }, "evidenceInsights":{ @@ -2217,11 +2236,11 @@ }, "sourceSetUpOption":{ "shape":"SourceSetUpOption", - "documentation":"<p> The setup option for the data source. This option reflects if the evidence collection is automated or manual. </p>" + "documentation":"<p>The setup option for the data source. This option reflects if the evidence collection method is automated or manual. If you don’t provide a value for <code>sourceSetUpOption</code>, Audit Manager automatically infers and populates the correct value based on the <code>sourceType</code> that you specify.</p>" }, "sourceType":{ "shape":"SourceType", - "documentation":"<p> Specifies one of the five data source types for evidence collection. </p>" + "documentation":"<p> Specifies which type of data source is used to collect evidence. </p> <ul> <li> <p>The source can be an individual data source type, such as <code>AWS_Cloudtrail</code>, <code>AWS_Config</code>, <code>AWS_Security_Hub</code>, <code>AWS_API_Call</code>, or <code>MANUAL</code>. </p> </li> <li> <p>The source can also be a managed grouping of data sources, such as a <code>Core_Control</code> or a <code>Common_Control</code>.</p> </li> </ul>" }, "sourceKeyword":{"shape":"SourceKeyword"}, "sourceFrequency":{ @@ -2340,6 +2359,13 @@ "min":1, "pattern":"^[a-zA-Z_0-9-\\s.,]+$" }, + "ControlState":{ + "type":"string", + "enum":[ + "ACTIVE", + "END_OF_SUPPORT" + ] + }, "ControlStatus":{ "type":"string", "enum":[ @@ -2352,7 +2378,8 @@ "type":"string", "enum":[ "Standard", - "Custom" + "Custom", + "Core" ] }, "Controls":{ @@ -2527,11 +2554,11 @@ }, "sourceSetUpOption":{ "shape":"SourceSetUpOption", - "documentation":"<p> The setup option for the data source, which reflects if the evidence collection is automated or manual. </p>" + "documentation":"<p>The setup option for the data source. This option reflects if the evidence collection method is automated or manual. If you don’t provide a value for <code>sourceSetUpOption</code>, Audit Manager automatically infers and populates the correct value based on the <code>sourceType</code> that you specify.</p>" }, "sourceType":{ "shape":"SourceType", - "documentation":"<p> Specifies one of the five types of data sources for evidence collection. </p>" + "documentation":"<p> Specifies which type of data source is used to collect evidence. </p> <ul> <li> <p>The source can be an individual data source type, such as <code>AWS_Cloudtrail</code>, <code>AWS_Config</code>, <code>AWS_Security_Hub</code>, <code>AWS_API_Call</code>, or <code>MANUAL</code>. </p> </li> <li> <p>The source can also be a managed grouping of data sources, such as a <code>Core_Control</code> or a <code>Common_Control</code>.</p> </li> </ul>" }, "sourceKeyword":{"shape":"SourceKeyword"}, "sourceFrequency":{ @@ -2543,7 +2570,7 @@ "documentation":"<p> The instructions for troubleshooting the control. </p>" } }, - "documentation":"<p> The control mapping fields that represent the source for evidence collection, along with related parameters and metadata. This doesn't contain <code>mappingID</code>. </p>" + "documentation":"<p>The mapping attributes that determine the evidence source for a given control, along with related parameters and metadata. This doesn't contain <code>mappingID</code>. </p>" }, "CreateControlMappingSources":{ "type":"list", @@ -2632,6 +2659,16 @@ "pattern":"^[a-zA-Z0-9\\s-_()\\[\\]]+$", "sensitive":true }, + "DataSourceType":{ + "type":"string", + "enum":[ + "AWS_Cloudtrail", + "AWS_Config", + "AWS_Security_Hub", + "AWS_API_Call", + "MANUAL" + ] + }, "DefaultExportDestination":{ "type":"structure", "members":{ @@ -3848,7 +3885,7 @@ "type":"string", "max":100, "min":1, - "pattern":"^[a-zA-Z_0-9-\\s().]+$" + "pattern":"^[a-zA-Z_0-9-\\s().:\\/]+$" }, "Keywords":{ "type":"list", @@ -3875,8 +3912,8 @@ ], "members":{ "controlDomainId":{ - "shape":"UUID", - "documentation":"<p>The unique identifier for the control domain. </p>", + "shape":"ControlDomainId", + "documentation":"<p>The unique identifier for the control domain. </p> <p>Audit Manager supports the control domains that are provided by Amazon Web Services Control Catalog. For information about how to find a list of available control domains, see <a href=\"https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListDomains.html\"> <code>ListDomains</code> </a> in the Amazon Web Services Control Catalog API Reference.</p>", "location":"querystring", "locationName":"controlDomainId" }, @@ -4129,8 +4166,8 @@ "required":["controlDomainId"], "members":{ "controlDomainId":{ - "shape":"UUID", - "documentation":"<p>The unique identifier for the control domain. </p>", + "shape":"ControlDomainId", + "documentation":"<p>The unique identifier for the control domain. </p> <p>Audit Manager supports the control domains that are provided by Amazon Web Services Control Catalog. For information about how to find a list of available control domains, see <a href=\"https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListDomains.html\"> <code>ListDomains</code> </a> in the Amazon Web Services Control Catalog API Reference.</p>", "location":"querystring", "locationName":"controlDomainId" }, @@ -4167,21 +4204,27 @@ "members":{ "controlType":{ "shape":"ControlType", - "documentation":"<p> The type of control, such as a standard control or a custom control. </p>", + "documentation":"<p>A filter that narrows the list of controls to a specific type. </p>", "location":"querystring", "locationName":"controlType" }, "nextToken":{ "shape":"Token", - "documentation":"<p> The pagination token that's used to fetch the next set of results. </p>", + "documentation":"<p>The pagination token that's used to fetch the next set of results. </p>", "location":"querystring", "locationName":"nextToken" }, "maxResults":{ "shape":"MaxResults", - "documentation":"<p> Represents the maximum number of results on a page or for an API request call. </p>", + "documentation":"<p>The maximum number of results on a page or for an API request call. </p>", "location":"querystring", "locationName":"maxResults" + }, + "controlCatalogId":{ + "shape":"ControlCatalogId", + "documentation":"<p>A filter that narrows the list of controls to a specific resource from the Amazon Web Services Control Catalog. </p> <p>To use this parameter, specify the ARN of the Control Catalog resource. You can specify either a control domain, a control objective, or a common control. For information about how to find the ARNs for these resources, see <a href=\"https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListDomains.html\"> <code>ListDomains</code> </a>, <a href=\"https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListObjectives.html\"> <code>ListObjectives</code> </a>, and <a href=\"https://docs.aws.amazon.com/controlcatalog/latest/APIReference/API_ListCommonControls.html\"> <code>ListCommonControls</code> </a>.</p> <note> <p>You can only filter by one Control Catalog resource at a time. Specifying multiple resource ARNs isn’t currently supported. If you want to filter by more than one ARN, we recommend that you run the <code>ListControls</code> operation separately for each ARN. </p> </note> <p>Alternatively, specify <code>UNCATEGORIZED</code> to list controls that aren't mapped to a Control Catalog resource. For example, this operation might return a list of custom controls that don't belong to any control domain or control objective.</p>", + "location":"querystring", + "locationName":"controlCatalogId" } } }, @@ -4194,7 +4237,7 @@ }, "nextToken":{ "shape":"Token", - "documentation":"<p> The pagination token that's used to fetch the next set of results. </p>" + "documentation":"<p>The pagination token that's used to fetch the next set of results. </p>" } } }, @@ -4203,8 +4246,8 @@ "required":["source"], "members":{ "source":{ - "shape":"SourceType", - "documentation":"<p> The control mapping data source that the keywords apply to. </p>", + "shape":"DataSourceType", + "documentation":"<p>The control mapping data source that the keywords apply to. </p>", "location":"querystring", "locationName":"source" }, @@ -4227,7 +4270,7 @@ "members":{ "keywords":{ "shape":"Keywords", - "documentation":"<p> The list of keywords for the event mapping source. </p>" + "documentation":"<p>The list of keywords for the control mapping source.</p>" }, "nextToken":{ "shape":"Token", @@ -4540,10 +4583,12 @@ }, "awsServices":{ "shape":"AWSServices", - "documentation":"<p> The Amazon Web Services services that are included in the scope of the assessment. </p>" + "documentation":"<p> The Amazon Web Services services that are included in the scope of the assessment. </p> <important> <p>This API parameter is no longer supported. If you use this parameter to specify one or more Amazon Web Services, Audit Manager ignores this input. Instead, the value for <code>awsServices</code> will show as empty.</p> </important>", + "deprecated":true, + "deprecatedMessage":"You can't specify services in scope when creating/updating an assessment. If you use the parameter to specify one or more AWS services, Audit Manager ignores the input. Instead the value of the parameter will show as empty indicating that the services are defined and managed by Audit Manager." } }, - "documentation":"<p> The wrapper that contains the Amazon Web Services accounts and services that are in scope for the assessment. </p>", + "documentation":"<p> The wrapper that contains the Amazon Web Services accounts that are in scope for the assessment. </p> <note> <p>You no longer need to specify which Amazon Web Services are in scope when you create or update an assessment. Audit Manager infers the services in scope by examining your assessment controls and their data sources, and then mapping this information to the relevant Amazon Web Services. </p> <p>If an underlying data source changes for your assessment, we automatically update the services scope as needed to reflect the correct Amazon Web Services. This ensures that your assessment collects accurate and comprehensive evidence about all of the relevant services in your AWS environment.</p> </note>", "sensitive":true }, "ServiceMetadata":{ @@ -4701,7 +4746,7 @@ }, "SourceName":{ "type":"string", - "max":100, + "max":300, "min":1 }, "SourceSetUpOption":{ @@ -4718,7 +4763,9 @@ "AWS_Config", "AWS_Security_Hub", "AWS_API_Call", - "MANUAL" + "MANUAL", + "Common_Control", + "Core_Control" ] }, "StartAssessmentFrameworkShareRequest":{ @@ -4826,7 +4873,7 @@ "message":{"shape":"String"} }, "documentation":"<p>The request was denied due to request throttling.</p>", - "error":{"httpStatusCode":400}, + "error":{"httpStatusCode":429}, "exception":true }, "Timestamp":{"type":"timestamp"}, diff --git a/services/autoscaling/pom.xml b/services/autoscaling/pom.xml index f543844c35cf..10b1f060b879 100644 --- a/services/autoscaling/pom.xml +++ b/services/autoscaling/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>autoscaling</artifactId> <name>AWS Java SDK :: Services :: Auto Scaling</name> diff --git a/services/autoscalingplans/pom.xml b/services/autoscalingplans/pom.xml index ba27855585a3..8eecfc93f1df 100644 --- a/services/autoscalingplans/pom.xml +++ b/services/autoscalingplans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>autoscalingplans</artifactId> <name>AWS Java SDK :: Services :: Auto Scaling Plans</name> diff --git a/services/b2bi/pom.xml b/services/b2bi/pom.xml index ffb77836a5bb..861dac6fd4e0 100644 --- a/services/b2bi/pom.xml +++ b/services/b2bi/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>b2bi</artifactId> <name>AWS Java SDK :: Services :: B2 Bi</name> diff --git a/services/b2bi/src/main/resources/codegen-resources/service-2.json b/services/b2bi/src/main/resources/codegen-resources/service-2.json index 7031d351e95e..85839cbfbaff 100644 --- a/services/b2bi/src/main/resources/codegen-resources/service-2.json +++ b/services/b2bi/src/main/resources/codegen-resources/service-2.json @@ -2,9 +2,11 @@ "version":"2.0", "metadata":{ "apiVersion":"2022-06-23", + "auth":["aws.auth#sigv4"], "endpointPrefix":"b2bi", "jsonVersion":"1.0", "protocol":"json", + "protocols":["json"], "serviceAbbreviation":"AWS B2BI", "serviceFullName":"AWS B2B Data Interchange", "serviceId":"b2bi", @@ -259,6 +261,12 @@ }, "input":{"shape":"ListCapabilitiesRequest"}, "output":{"shape":"ListCapabilitiesResponse"}, + "errors":[ + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"ThrottlingException"}, + {"shape":"InternalServerException"} + ], "documentation":"<p>Lists the capabilities associated with your Amazon Web Services account for your current or specified region. A trading capability contains the information required to transform incoming EDI documents into JSON or XML outputs.</p>" }, "ListPartnerships":{ @@ -286,6 +294,12 @@ }, "input":{"shape":"ListProfilesRequest"}, "output":{"shape":"ListProfilesResponse"}, + "errors":[ + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"ThrottlingException"}, + {"shape":"InternalServerException"} + ], "documentation":"<p>Lists the profiles associated with your Amazon Web Services account for your current or specified region. A profile is the mechanism used to create the concept of a private network.</p>" }, "ListTagsForResource":{ @@ -311,6 +325,12 @@ }, "input":{"shape":"ListTransformersRequest"}, "output":{"shape":"ListTransformersResponse"}, + "errors":[ + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"ThrottlingException"}, + {"shape":"InternalServerException"} + ], "documentation":"<p>Lists the available transformers. A transformer describes how to process the incoming EDI documents and extract the necessary information to the output file.</p>" }, "StartTransformerJob":{ @@ -322,6 +342,7 @@ "input":{"shape":"StartTransformerJobRequest"}, "output":{"shape":"StartTransformerJobResponse"}, "errors":[ + {"shape":"ConflictException"}, {"shape":"AccessDeniedException"}, {"shape":"ValidationException"}, {"shape":"ThrottlingException"}, @@ -655,7 +676,8 @@ "required":[ "profileId", "name", - "email" + "email", + "capabilities" ], "members":{ "profileId":{ diff --git a/services/backup/pom.xml b/services/backup/pom.xml index 1722afaf520f..c9fcde3f0fee 100644 --- a/services/backup/pom.xml +++ b/services/backup/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>backup</artifactId> <name>AWS Java SDK :: Services :: Backup</name> diff --git a/services/backupgateway/pom.xml b/services/backupgateway/pom.xml index d79eb303d486..e34e80246b6c 100644 --- a/services/backupgateway/pom.xml +++ b/services/backupgateway/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>backupgateway</artifactId> <name>AWS Java SDK :: Services :: Backup Gateway</name> diff --git a/services/backupstorage/pom.xml b/services/backupstorage/pom.xml index 1b71a02e28f9..34337b0375e0 100644 --- a/services/backupstorage/pom.xml +++ b/services/backupstorage/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>backupstorage</artifactId> <name>AWS Java SDK :: Services :: Backup Storage</name> diff --git a/services/batch/pom.xml b/services/batch/pom.xml index 7800d438659b..c6e616fe4c11 100644 --- a/services/batch/pom.xml +++ b/services/batch/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>batch</artifactId> <name>AWS Java SDK :: Services :: AWS Batch</name> diff --git a/services/bcmdataexports/pom.xml b/services/bcmdataexports/pom.xml index c7387190b80d..76656d21fe7c 100644 --- a/services/bcmdataexports/pom.xml +++ b/services/bcmdataexports/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>bcmdataexports</artifactId> <name>AWS Java SDK :: Services :: BCM Data Exports</name> diff --git a/services/bedrock/pom.xml b/services/bedrock/pom.xml index c71f691ec1fc..b5aa8b05c21f 100644 --- a/services/bedrock/pom.xml +++ b/services/bedrock/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>bedrock</artifactId> <name>AWS Java SDK :: Services :: Bedrock</name> diff --git a/services/bedrockagent/pom.xml b/services/bedrockagent/pom.xml index 2b06b0251caa..1b11f9afdd60 100644 --- a/services/bedrockagent/pom.xml +++ b/services/bedrockagent/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>bedrockagent</artifactId> <name>AWS Java SDK :: Services :: Bedrock Agent</name> diff --git a/services/bedrockagentruntime/pom.xml b/services/bedrockagentruntime/pom.xml index e1d831c0dde1..5e2470d0e99e 100644 --- a/services/bedrockagentruntime/pom.xml +++ b/services/bedrockagentruntime/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>bedrockagentruntime</artifactId> <name>AWS Java SDK :: Services :: Bedrock Agent Runtime</name> diff --git a/services/bedrockruntime/pom.xml b/services/bedrockruntime/pom.xml index a0fbaf0f5dfa..4556655579d5 100644 --- a/services/bedrockruntime/pom.xml +++ b/services/bedrockruntime/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>bedrockruntime</artifactId> <name>AWS Java SDK :: Services :: Bedrock Runtime</name> diff --git a/services/billingconductor/pom.xml b/services/billingconductor/pom.xml index 92eba4d48756..e99efa5bf64c 100644 --- a/services/billingconductor/pom.xml +++ b/services/billingconductor/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>billingconductor</artifactId> <name>AWS Java SDK :: Services :: Billingconductor</name> diff --git a/services/braket/pom.xml b/services/braket/pom.xml index 3fb575da7fb6..1305369ec3d5 100644 --- a/services/braket/pom.xml +++ b/services/braket/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>braket</artifactId> <name>AWS Java SDK :: Services :: Braket</name> diff --git a/services/budgets/pom.xml b/services/budgets/pom.xml index 5874ace500ed..239fb2058dfa 100644 --- a/services/budgets/pom.xml +++ b/services/budgets/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>budgets</artifactId> <name>AWS Java SDK :: Services :: AWS Budgets</name> diff --git a/services/chatbot/pom.xml b/services/chatbot/pom.xml index 27eccd9e13bc..4dcd87ba5d5b 100644 --- a/services/chatbot/pom.xml +++ b/services/chatbot/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>chatbot</artifactId> <name>AWS Java SDK :: Services :: Chatbot</name> diff --git a/services/chime/pom.xml b/services/chime/pom.xml index f1ddd0de15e4..626d28393a19 100644 --- a/services/chime/pom.xml +++ b/services/chime/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>chime</artifactId> <name>AWS Java SDK :: Services :: Chime</name> diff --git a/services/chimesdkidentity/pom.xml b/services/chimesdkidentity/pom.xml index 696b5b0342ae..77346e40efaf 100644 --- a/services/chimesdkidentity/pom.xml +++ b/services/chimesdkidentity/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>chimesdkidentity</artifactId> <name>AWS Java SDK :: Services :: Chime SDK Identity</name> diff --git a/services/chimesdkmediapipelines/pom.xml b/services/chimesdkmediapipelines/pom.xml index 122cd62867b3..471b8da93177 100644 --- a/services/chimesdkmediapipelines/pom.xml +++ b/services/chimesdkmediapipelines/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>chimesdkmediapipelines</artifactId> <name>AWS Java SDK :: Services :: Chime SDK Media Pipelines</name> diff --git a/services/chimesdkmeetings/pom.xml b/services/chimesdkmeetings/pom.xml index 3bf997afa107..2055b5ab51bb 100644 --- a/services/chimesdkmeetings/pom.xml +++ b/services/chimesdkmeetings/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>chimesdkmeetings</artifactId> <name>AWS Java SDK :: Services :: Chime SDK Meetings</name> diff --git a/services/chimesdkmessaging/pom.xml b/services/chimesdkmessaging/pom.xml index a807584d6dee..9cd6c80d609f 100644 --- a/services/chimesdkmessaging/pom.xml +++ b/services/chimesdkmessaging/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>chimesdkmessaging</artifactId> <name>AWS Java SDK :: Services :: Chime SDK Messaging</name> diff --git a/services/chimesdkvoice/pom.xml b/services/chimesdkvoice/pom.xml index a78489370430..e3d2e089c4f0 100644 --- a/services/chimesdkvoice/pom.xml +++ b/services/chimesdkvoice/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>chimesdkvoice</artifactId> <name>AWS Java SDK :: Services :: Chime SDK Voice</name> diff --git a/services/cleanrooms/pom.xml b/services/cleanrooms/pom.xml index b95a20110fcd..bae379f9ca7a 100644 --- a/services/cleanrooms/pom.xml +++ b/services/cleanrooms/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cleanrooms</artifactId> <name>AWS Java SDK :: Services :: Clean Rooms</name> diff --git a/services/cleanroomsml/pom.xml b/services/cleanroomsml/pom.xml index 0de419ada87c..accd769f6c4c 100644 --- a/services/cleanroomsml/pom.xml +++ b/services/cleanroomsml/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cleanroomsml</artifactId> <name>AWS Java SDK :: Services :: Clean Rooms ML</name> diff --git a/services/cloud9/pom.xml b/services/cloud9/pom.xml index b2592984235d..b113c8ce8bfa 100644 --- a/services/cloud9/pom.xml +++ b/services/cloud9/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>cloud9</artifactId> diff --git a/services/cloudcontrol/pom.xml b/services/cloudcontrol/pom.xml index 584bd3ea033b..e807ce54702d 100644 --- a/services/cloudcontrol/pom.xml +++ b/services/cloudcontrol/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cloudcontrol</artifactId> <name>AWS Java SDK :: Services :: Cloud Control</name> diff --git a/services/clouddirectory/pom.xml b/services/clouddirectory/pom.xml index 53911602f128..29ef1e9202a1 100644 --- a/services/clouddirectory/pom.xml +++ b/services/clouddirectory/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>clouddirectory</artifactId> <name>AWS Java SDK :: Services :: Amazon CloudDirectory</name> diff --git a/services/cloudformation/pom.xml b/services/cloudformation/pom.xml index 897834671d80..ea6bdaaf2c4c 100644 --- a/services/cloudformation/pom.xml +++ b/services/cloudformation/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cloudformation</artifactId> <name>AWS Java SDK :: Services :: AWS CloudFormation</name> diff --git a/services/cloudfront/pom.xml b/services/cloudfront/pom.xml index ff13438a928f..025fa62e78bc 100644 --- a/services/cloudfront/pom.xml +++ b/services/cloudfront/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cloudfront</artifactId> <name>AWS Java SDK :: Services :: Amazon CloudFront</name> diff --git a/services/cloudfrontkeyvaluestore/pom.xml b/services/cloudfrontkeyvaluestore/pom.xml index b6eae597520c..3b6d729d738a 100644 --- a/services/cloudfrontkeyvaluestore/pom.xml +++ b/services/cloudfrontkeyvaluestore/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cloudfrontkeyvaluestore</artifactId> <name>AWS Java SDK :: Services :: Cloud Front Key Value Store</name> diff --git a/services/cloudhsm/pom.xml b/services/cloudhsm/pom.xml index 23a6b7bdf877..b08cad49fc6e 100644 --- a/services/cloudhsm/pom.xml +++ b/services/cloudhsm/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cloudhsm</artifactId> <name>AWS Java SDK :: Services :: AWS CloudHSM</name> diff --git a/services/cloudhsmv2/pom.xml b/services/cloudhsmv2/pom.xml index 62eb7f711d21..0f386d95737d 100644 --- a/services/cloudhsmv2/pom.xml +++ b/services/cloudhsmv2/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>cloudhsmv2</artifactId> diff --git a/services/cloudsearch/pom.xml b/services/cloudsearch/pom.xml index e991dc5a490c..dcf0a17f8355 100644 --- a/services/cloudsearch/pom.xml +++ b/services/cloudsearch/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cloudsearch</artifactId> <name>AWS Java SDK :: Services :: Amazon CloudSearch</name> diff --git a/services/cloudsearchdomain/pom.xml b/services/cloudsearchdomain/pom.xml index 6315b1f6700e..f6fba93e98a4 100644 --- a/services/cloudsearchdomain/pom.xml +++ b/services/cloudsearchdomain/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cloudsearchdomain</artifactId> <name>AWS Java SDK :: Services :: Amazon CloudSearch Domain</name> diff --git a/services/cloudtrail/pom.xml b/services/cloudtrail/pom.xml index 31d27f108642..022b0df6e6d8 100644 --- a/services/cloudtrail/pom.xml +++ b/services/cloudtrail/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cloudtrail</artifactId> <name>AWS Java SDK :: Services :: AWS CloudTrail</name> diff --git a/services/cloudtraildata/pom.xml b/services/cloudtraildata/pom.xml index 37829df74b2c..4e2b213dfae6 100644 --- a/services/cloudtraildata/pom.xml +++ b/services/cloudtraildata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cloudtraildata</artifactId> <name>AWS Java SDK :: Services :: Cloud Trail Data</name> diff --git a/services/cloudwatch/pom.xml b/services/cloudwatch/pom.xml index 6afcf241d5e6..d91dac0f049c 100644 --- a/services/cloudwatch/pom.xml +++ b/services/cloudwatch/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cloudwatch</artifactId> <name>AWS Java SDK :: Services :: Amazon CloudWatch</name> diff --git a/services/cloudwatchevents/pom.xml b/services/cloudwatchevents/pom.xml index b9c877319992..11dd66397d11 100644 --- a/services/cloudwatchevents/pom.xml +++ b/services/cloudwatchevents/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cloudwatchevents</artifactId> <name>AWS Java SDK :: Services :: Amazon CloudWatch Events</name> diff --git a/services/cloudwatchlogs/pom.xml b/services/cloudwatchlogs/pom.xml index f47e4c5121ec..6cc34c21f997 100644 --- a/services/cloudwatchlogs/pom.xml +++ b/services/cloudwatchlogs/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cloudwatchlogs</artifactId> <name>AWS Java SDK :: Services :: Amazon CloudWatch Logs</name> diff --git a/services/codeartifact/pom.xml b/services/codeartifact/pom.xml index d770d8cba773..03a18280742b 100644 --- a/services/codeartifact/pom.xml +++ b/services/codeartifact/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>codeartifact</artifactId> <name>AWS Java SDK :: Services :: Codeartifact</name> diff --git a/services/codebuild/pom.xml b/services/codebuild/pom.xml index d6379ab61e56..0be843cc24a8 100644 --- a/services/codebuild/pom.xml +++ b/services/codebuild/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>codebuild</artifactId> <name>AWS Java SDK :: Services :: AWS Code Build</name> diff --git a/services/codecatalyst/pom.xml b/services/codecatalyst/pom.xml index 5ccd32d890b1..e58513309fe9 100644 --- a/services/codecatalyst/pom.xml +++ b/services/codecatalyst/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>codecatalyst</artifactId> <name>AWS Java SDK :: Services :: Code Catalyst</name> diff --git a/services/codecommit/pom.xml b/services/codecommit/pom.xml index 0e63de9d6d33..027e01e9cafa 100644 --- a/services/codecommit/pom.xml +++ b/services/codecommit/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>codecommit</artifactId> <name>AWS Java SDK :: Services :: AWS CodeCommit</name> diff --git a/services/codeconnections/pom.xml b/services/codeconnections/pom.xml index b90ab7edb965..177c525ad627 100644 --- a/services/codeconnections/pom.xml +++ b/services/codeconnections/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>codeconnections</artifactId> <name>AWS Java SDK :: Services :: Code Connections</name> diff --git a/services/codedeploy/pom.xml b/services/codedeploy/pom.xml index 3bc1ac9e3f59..571e0174c2b2 100644 --- a/services/codedeploy/pom.xml +++ b/services/codedeploy/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>codedeploy</artifactId> <name>AWS Java SDK :: Services :: AWS CodeDeploy</name> diff --git a/services/codeguruprofiler/pom.xml b/services/codeguruprofiler/pom.xml index b6608c8013d7..93f8b57f9f0f 100644 --- a/services/codeguruprofiler/pom.xml +++ b/services/codeguruprofiler/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>codeguruprofiler</artifactId> <name>AWS Java SDK :: Services :: CodeGuruProfiler</name> diff --git a/services/codegurureviewer/pom.xml b/services/codegurureviewer/pom.xml index 1ebac5175afb..c29c64c6006a 100644 --- a/services/codegurureviewer/pom.xml +++ b/services/codegurureviewer/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>codegurureviewer</artifactId> <name>AWS Java SDK :: Services :: CodeGuru Reviewer</name> diff --git a/services/codegurusecurity/pom.xml b/services/codegurusecurity/pom.xml index 793d70e6b19c..a6364fbd3bb3 100644 --- a/services/codegurusecurity/pom.xml +++ b/services/codegurusecurity/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>codegurusecurity</artifactId> <name>AWS Java SDK :: Services :: Code Guru Security</name> diff --git a/services/codepipeline/pom.xml b/services/codepipeline/pom.xml index 2c69d1b9f662..205842c1cc39 100644 --- a/services/codepipeline/pom.xml +++ b/services/codepipeline/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>codepipeline</artifactId> <name>AWS Java SDK :: Services :: AWS CodePipeline</name> diff --git a/services/codepipeline/src/main/resources/codegen-resources/service-2.json b/services/codepipeline/src/main/resources/codegen-resources/service-2.json index 4d63dc9e4267..81a50c716b77 100644 --- a/services/codepipeline/src/main/resources/codegen-resources/service-2.json +++ b/services/codepipeline/src/main/resources/codegen-resources/service-2.json @@ -11,7 +11,8 @@ "serviceId":"CodePipeline", "signatureVersion":"v4", "targetPrefix":"CodePipeline_20150709", - "uid":"codepipeline-2015-07-09" + "uid":"codepipeline-2015-07-09", + "auth":["aws.auth#sigv4"] }, "operations":{ "AcknowledgeJob":{ @@ -297,7 +298,7 @@ {"shape":"PipelineNotFoundException"}, {"shape":"InvalidNextTokenException"} ], - "documentation":"<p>Gets a summary of the most recent executions for a pipeline.</p>" + "documentation":"<p>Gets a summary of the most recent executions for a pipeline.</p> <note> <p>When applying the filter for pipeline executions that have succeeded in the stage, the operation returns all executions in the current pipeline version beginning on February 1, 2024.</p> </note>" }, "ListPipelines":{ "name":"ListPipelines", @@ -2812,7 +2813,7 @@ }, "maxResults":{ "shape":"MaxResults", - "documentation":"<p>The maximum number of results to return in a single call. To retrieve the remaining results, make another call with the returned nextToken value. Action execution history is retained for up to 12 months, based on action execution start times. Default value is 100. </p> <note> <p>Detailed execution history is available for executions run on or after February 21, 2019.</p> </note>" + "documentation":"<p>The maximum number of results to return in a single call. To retrieve the remaining results, make another call with the returned nextToken value. Action execution history is retained for up to 12 months, based on action execution start times. Default value is 100. </p>" }, "nextToken":{ "shape":"NextToken", @@ -4102,7 +4103,7 @@ "documentation":"<p>The source revision, or version of your source artifact, with the changes that you want to run in the pipeline execution.</p>" } }, - "documentation":"<p>A list that allows you to specify, or override, the source revision for a pipeline execution that's being started. A source revision is the version with all the changes to your application code, or source artifact, for the pipeline execution.</p>" + "documentation":"<p>A list that allows you to specify, or override, the source revision for a pipeline execution that's being started. A source revision is the version with all the changes to your application code, or source artifact, for the pipeline execution.</p> <note> <p>For the <code>S3_OBJECT_VERSION_ID</code> and <code>S3_OBJECT_KEY</code> types of source revisions, either of the types can be used independently, or they can be used together to override the source with a specific ObjectKey and VersionID.</p> </note>" }, "SourceRevisionOverrideList":{ "type":"list", @@ -4115,7 +4116,8 @@ "enum":[ "COMMIT_ID", "IMAGE_DIGEST", - "S3_OBJECT_VERSION_ID" + "S3_OBJECT_VERSION_ID", + "S3_OBJECT_KEY" ] }, "StageActionDeclarationList":{ diff --git a/services/codestar/pom.xml b/services/codestar/pom.xml index 81938de60d82..796a8b330372 100644 --- a/services/codestar/pom.xml +++ b/services/codestar/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>codestar</artifactId> <name>AWS Java SDK :: Services :: AWS CodeStar</name> diff --git a/services/codestarconnections/pom.xml b/services/codestarconnections/pom.xml index 66439376972a..92175e3bfb2a 100644 --- a/services/codestarconnections/pom.xml +++ b/services/codestarconnections/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>codestarconnections</artifactId> <name>AWS Java SDK :: Services :: CodeStar connections</name> diff --git a/services/codestarnotifications/pom.xml b/services/codestarnotifications/pom.xml index 546c00615aca..e8c4c242f319 100644 --- a/services/codestarnotifications/pom.xml +++ b/services/codestarnotifications/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>codestarnotifications</artifactId> <name>AWS Java SDK :: Services :: Codestar Notifications</name> diff --git a/services/cognitoidentity/pom.xml b/services/cognitoidentity/pom.xml index 361b88f02f5e..58f820ad702d 100644 --- a/services/cognitoidentity/pom.xml +++ b/services/cognitoidentity/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cognitoidentity</artifactId> <name>AWS Java SDK :: Services :: Amazon Cognito Identity</name> diff --git a/services/cognitoidentityprovider/pom.xml b/services/cognitoidentityprovider/pom.xml index f1ebfaf957bd..f64f94ce64ea 100644 --- a/services/cognitoidentityprovider/pom.xml +++ b/services/cognitoidentityprovider/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cognitoidentityprovider</artifactId> <name>AWS Java SDK :: Services :: Amazon Cognito Identity Provider Service</name> diff --git a/services/cognitosync/pom.xml b/services/cognitosync/pom.xml index 1fb2ab6ecdd9..22df5cf1c3e9 100644 --- a/services/cognitosync/pom.xml +++ b/services/cognitosync/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>cognitosync</artifactId> <name>AWS Java SDK :: Services :: Amazon Cognito Sync</name> diff --git a/services/comprehend/pom.xml b/services/comprehend/pom.xml index 183627e82563..eb14b288808b 100644 --- a/services/comprehend/pom.xml +++ b/services/comprehend/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>comprehend</artifactId> diff --git a/services/comprehendmedical/pom.xml b/services/comprehendmedical/pom.xml index 62ff922c4947..98de570b76a5 100644 --- a/services/comprehendmedical/pom.xml +++ b/services/comprehendmedical/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>comprehendmedical</artifactId> <name>AWS Java SDK :: Services :: ComprehendMedical</name> diff --git a/services/computeoptimizer/pom.xml b/services/computeoptimizer/pom.xml index 13973179a4f8..fbbdd194d46d 100644 --- a/services/computeoptimizer/pom.xml +++ b/services/computeoptimizer/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>computeoptimizer</artifactId> <name>AWS Java SDK :: Services :: Compute Optimizer</name> diff --git a/services/config/pom.xml b/services/config/pom.xml index 1585c50c4265..24dbbde9c157 100644 --- a/services/config/pom.xml +++ b/services/config/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>config</artifactId> <name>AWS Java SDK :: Services :: AWS Config</name> diff --git a/services/connect/pom.xml b/services/connect/pom.xml index e59777edc0bf..fc403bd9b560 100644 --- a/services/connect/pom.xml +++ b/services/connect/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>connect</artifactId> <name>AWS Java SDK :: Services :: Connect</name> diff --git a/services/connectcampaigns/pom.xml b/services/connectcampaigns/pom.xml index fca8bc982a31..fd18101effa4 100644 --- a/services/connectcampaigns/pom.xml +++ b/services/connectcampaigns/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>connectcampaigns</artifactId> <name>AWS Java SDK :: Services :: Connect Campaigns</name> diff --git a/services/connectcases/pom.xml b/services/connectcases/pom.xml index 0da5b3a41178..5fc17c75dcae 100644 --- a/services/connectcases/pom.xml +++ b/services/connectcases/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>connectcases</artifactId> <name>AWS Java SDK :: Services :: Connect Cases</name> diff --git a/services/connectcontactlens/pom.xml b/services/connectcontactlens/pom.xml index d5056ee0264d..6e292d5df656 100644 --- a/services/connectcontactlens/pom.xml +++ b/services/connectcontactlens/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>connectcontactlens</artifactId> <name>AWS Java SDK :: Services :: Connect Contact Lens</name> diff --git a/services/connectparticipant/pom.xml b/services/connectparticipant/pom.xml index 410331540db4..2bbf587aa503 100644 --- a/services/connectparticipant/pom.xml +++ b/services/connectparticipant/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>connectparticipant</artifactId> <name>AWS Java SDK :: Services :: ConnectParticipant</name> diff --git a/services/controlcatalog/pom.xml b/services/controlcatalog/pom.xml index c452c75dadc7..4c9fa96ab0cb 100644 --- a/services/controlcatalog/pom.xml +++ b/services/controlcatalog/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>controlcatalog</artifactId> <name>AWS Java SDK :: Services :: Control Catalog</name> diff --git a/services/controltower/pom.xml b/services/controltower/pom.xml index 70b2071e408e..d84a7994481c 100644 --- a/services/controltower/pom.xml +++ b/services/controltower/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>controltower</artifactId> <name>AWS Java SDK :: Services :: Control Tower</name> diff --git a/services/costandusagereport/pom.xml b/services/costandusagereport/pom.xml index 49c7fa97084a..06ed67e97c8d 100644 --- a/services/costandusagereport/pom.xml +++ b/services/costandusagereport/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>costandusagereport</artifactId> <name>AWS Java SDK :: Services :: AWS Cost and Usage Report</name> diff --git a/services/costexplorer/pom.xml b/services/costexplorer/pom.xml index 47bafcebb1ca..a0f15ff73e1c 100644 --- a/services/costexplorer/pom.xml +++ b/services/costexplorer/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>costexplorer</artifactId> diff --git a/services/costoptimizationhub/pom.xml b/services/costoptimizationhub/pom.xml index dd5ad33ff59e..7e769bab1bfb 100644 --- a/services/costoptimizationhub/pom.xml +++ b/services/costoptimizationhub/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>costoptimizationhub</artifactId> <name>AWS Java SDK :: Services :: Cost Optimization Hub</name> diff --git a/services/customerprofiles/pom.xml b/services/customerprofiles/pom.xml index 841583c7c2f8..5d9bd45d3e52 100644 --- a/services/customerprofiles/pom.xml +++ b/services/customerprofiles/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>customerprofiles</artifactId> <name>AWS Java SDK :: Services :: Customer Profiles</name> diff --git a/services/databasemigration/pom.xml b/services/databasemigration/pom.xml index 89cfb216f891..35ad38a16d6c 100644 --- a/services/databasemigration/pom.xml +++ b/services/databasemigration/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>databasemigration</artifactId> <name>AWS Java SDK :: Services :: AWS Database Migration Service</name> diff --git a/services/databrew/pom.xml b/services/databrew/pom.xml index f21c8e8ebbb0..7056d427b925 100644 --- a/services/databrew/pom.xml +++ b/services/databrew/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>databrew</artifactId> <name>AWS Java SDK :: Services :: Data Brew</name> diff --git a/services/dataexchange/pom.xml b/services/dataexchange/pom.xml index dce2e6e30e0d..0af2a9892ceb 100644 --- a/services/dataexchange/pom.xml +++ b/services/dataexchange/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>dataexchange</artifactId> <name>AWS Java SDK :: Services :: DataExchange</name> diff --git a/services/datapipeline/pom.xml b/services/datapipeline/pom.xml index 8aaeebe198d9..56949baf8042 100644 --- a/services/datapipeline/pom.xml +++ b/services/datapipeline/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>datapipeline</artifactId> <name>AWS Java SDK :: Services :: AWS Data Pipeline</name> diff --git a/services/datasync/pom.xml b/services/datasync/pom.xml index 9d99a27bfbd4..352665969719 100644 --- a/services/datasync/pom.xml +++ b/services/datasync/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>datasync</artifactId> <name>AWS Java SDK :: Services :: DataSync</name> diff --git a/services/datazone/pom.xml b/services/datazone/pom.xml index fc83c396d4b6..f2b8a4362197 100644 --- a/services/datazone/pom.xml +++ b/services/datazone/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>datazone</artifactId> <name>AWS Java SDK :: Services :: Data Zone</name> diff --git a/services/dax/pom.xml b/services/dax/pom.xml index 76754bb20feb..a347a805f186 100644 --- a/services/dax/pom.xml +++ b/services/dax/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>dax</artifactId> <name>AWS Java SDK :: Services :: Amazon DynamoDB Accelerator (DAX)</name> diff --git a/services/deadline/pom.xml b/services/deadline/pom.xml index edf7d0f03885..24d21a006cd4 100644 --- a/services/deadline/pom.xml +++ b/services/deadline/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>deadline</artifactId> <name>AWS Java SDK :: Services :: Deadline</name> diff --git a/services/detective/pom.xml b/services/detective/pom.xml index 6addcde162fa..352658e8dfa4 100644 --- a/services/detective/pom.xml +++ b/services/detective/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>detective</artifactId> <name>AWS Java SDK :: Services :: Detective</name> diff --git a/services/devicefarm/pom.xml b/services/devicefarm/pom.xml index 12c937bb196c..255dcd7eb467 100644 --- a/services/devicefarm/pom.xml +++ b/services/devicefarm/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>devicefarm</artifactId> <name>AWS Java SDK :: Services :: AWS Device Farm</name> diff --git a/services/devopsguru/pom.xml b/services/devopsguru/pom.xml index b7708047712b..bff5c1a682dc 100644 --- a/services/devopsguru/pom.xml +++ b/services/devopsguru/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>devopsguru</artifactId> <name>AWS Java SDK :: Services :: Dev Ops Guru</name> diff --git a/services/directconnect/pom.xml b/services/directconnect/pom.xml index 635fa60895e9..0b641c08ad76 100644 --- a/services/directconnect/pom.xml +++ b/services/directconnect/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>directconnect</artifactId> <name>AWS Java SDK :: Services :: AWS Direct Connect</name> diff --git a/services/directory/pom.xml b/services/directory/pom.xml index 1a8e2683e747..d9ff00e662bc 100644 --- a/services/directory/pom.xml +++ b/services/directory/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>directory</artifactId> <name>AWS Java SDK :: Services :: AWS Directory Service</name> diff --git a/services/dlm/pom.xml b/services/dlm/pom.xml index fcba736ce6b6..ddee4cf9841c 100644 --- a/services/dlm/pom.xml +++ b/services/dlm/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>dlm</artifactId> <name>AWS Java SDK :: Services :: DLM</name> diff --git a/services/docdb/pom.xml b/services/docdb/pom.xml index 59d59b40ffa0..3596bce3ba2e 100644 --- a/services/docdb/pom.xml +++ b/services/docdb/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>docdb</artifactId> <name>AWS Java SDK :: Services :: DocDB</name> diff --git a/services/docdbelastic/pom.xml b/services/docdbelastic/pom.xml index 8facab2feed4..dbde65c33c66 100644 --- a/services/docdbelastic/pom.xml +++ b/services/docdbelastic/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>docdbelastic</artifactId> <name>AWS Java SDK :: Services :: Doc DB Elastic</name> diff --git a/services/drs/pom.xml b/services/drs/pom.xml index fb21d4328788..8a24251de377 100644 --- a/services/drs/pom.xml +++ b/services/drs/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>drs</artifactId> <name>AWS Java SDK :: Services :: Drs</name> diff --git a/services/dynamodb/pom.xml b/services/dynamodb/pom.xml index b59cc1b58f6f..f8bc07f2a3ac 100644 --- a/services/dynamodb/pom.xml +++ b/services/dynamodb/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>dynamodb</artifactId> <name>AWS Java SDK :: Services :: Amazon DynamoDB</name> diff --git a/services/ebs/pom.xml b/services/ebs/pom.xml index 532b0b0dc32f..7975779769a5 100644 --- a/services/ebs/pom.xml +++ b/services/ebs/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ebs</artifactId> <name>AWS Java SDK :: Services :: EBS</name> diff --git a/services/ec2/pom.xml b/services/ec2/pom.xml index be9e99e6f494..c5044eeb965c 100644 --- a/services/ec2/pom.xml +++ b/services/ec2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ec2</artifactId> <name>AWS Java SDK :: Services :: Amazon EC2</name> diff --git a/services/ec2instanceconnect/pom.xml b/services/ec2instanceconnect/pom.xml index 5110f3cedea6..4875c6d03670 100644 --- a/services/ec2instanceconnect/pom.xml +++ b/services/ec2instanceconnect/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ec2instanceconnect</artifactId> <name>AWS Java SDK :: Services :: EC2 Instance Connect</name> diff --git a/services/ecr/pom.xml b/services/ecr/pom.xml index da5d313388c5..c638bcf6683f 100644 --- a/services/ecr/pom.xml +++ b/services/ecr/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ecr</artifactId> <name>AWS Java SDK :: Services :: Amazon EC2 Container Registry</name> diff --git a/services/ecrpublic/pom.xml b/services/ecrpublic/pom.xml index 2e0da366c7c5..c3493c4e3593 100644 --- a/services/ecrpublic/pom.xml +++ b/services/ecrpublic/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ecrpublic</artifactId> <name>AWS Java SDK :: Services :: ECR PUBLIC</name> diff --git a/services/ecs/pom.xml b/services/ecs/pom.xml index b0405f3be35d..fb7a2adf9426 100644 --- a/services/ecs/pom.xml +++ b/services/ecs/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ecs</artifactId> <name>AWS Java SDK :: Services :: Amazon EC2 Container Service</name> diff --git a/services/efs/pom.xml b/services/efs/pom.xml index 49160e1a42ac..2e1ac75f5220 100644 --- a/services/efs/pom.xml +++ b/services/efs/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>efs</artifactId> <name>AWS Java SDK :: Services :: Amazon Elastic File System</name> diff --git a/services/eks/pom.xml b/services/eks/pom.xml index 7b067a25c0cb..9c143a604809 100644 --- a/services/eks/pom.xml +++ b/services/eks/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>eks</artifactId> <name>AWS Java SDK :: Services :: EKS</name> diff --git a/services/eksauth/pom.xml b/services/eksauth/pom.xml index 33580de3b3fd..3496819745e0 100644 --- a/services/eksauth/pom.xml +++ b/services/eksauth/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>eksauth</artifactId> <name>AWS Java SDK :: Services :: EKS Auth</name> diff --git a/services/elasticache/pom.xml b/services/elasticache/pom.xml index 8661e8bdd91a..06e0794e79f4 100644 --- a/services/elasticache/pom.xml +++ b/services/elasticache/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>elasticache</artifactId> <name>AWS Java SDK :: Services :: Amazon ElastiCache</name> diff --git a/services/elasticbeanstalk/pom.xml b/services/elasticbeanstalk/pom.xml index bff79be06803..c355ea641690 100644 --- a/services/elasticbeanstalk/pom.xml +++ b/services/elasticbeanstalk/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>elasticbeanstalk</artifactId> <name>AWS Java SDK :: Services :: AWS Elastic Beanstalk</name> diff --git a/services/elasticinference/pom.xml b/services/elasticinference/pom.xml index ff694fdfc337..edaa239cd68d 100644 --- a/services/elasticinference/pom.xml +++ b/services/elasticinference/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>elasticinference</artifactId> <name>AWS Java SDK :: Services :: Elastic Inference</name> diff --git a/services/elasticloadbalancing/pom.xml b/services/elasticloadbalancing/pom.xml index 570610852835..ecdea5abb1aa 100644 --- a/services/elasticloadbalancing/pom.xml +++ b/services/elasticloadbalancing/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>elasticloadbalancing</artifactId> <name>AWS Java SDK :: Services :: Elastic Load Balancing</name> diff --git a/services/elasticloadbalancingv2/pom.xml b/services/elasticloadbalancingv2/pom.xml index b1e4a3262bed..7e774692d072 100644 --- a/services/elasticloadbalancingv2/pom.xml +++ b/services/elasticloadbalancingv2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>elasticloadbalancingv2</artifactId> <name>AWS Java SDK :: Services :: Elastic Load Balancing V2</name> diff --git a/services/elasticsearch/pom.xml b/services/elasticsearch/pom.xml index c062f8dda592..4b2575944af7 100644 --- a/services/elasticsearch/pom.xml +++ b/services/elasticsearch/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>elasticsearch</artifactId> <name>AWS Java SDK :: Services :: Amazon Elasticsearch Service</name> diff --git a/services/elastictranscoder/pom.xml b/services/elastictranscoder/pom.xml index a2e831856cf4..3387d0871040 100644 --- a/services/elastictranscoder/pom.xml +++ b/services/elastictranscoder/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>elastictranscoder</artifactId> <name>AWS Java SDK :: Services :: Amazon Elastic Transcoder</name> diff --git a/services/emr/pom.xml b/services/emr/pom.xml index 4ab978a8d126..ffc92b941990 100644 --- a/services/emr/pom.xml +++ b/services/emr/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>emr</artifactId> <name>AWS Java SDK :: Services :: Amazon EMR</name> diff --git a/services/emrcontainers/pom.xml b/services/emrcontainers/pom.xml index 918593557cde..2750a01f69f5 100644 --- a/services/emrcontainers/pom.xml +++ b/services/emrcontainers/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>emrcontainers</artifactId> <name>AWS Java SDK :: Services :: EMR Containers</name> diff --git a/services/emrserverless/pom.xml b/services/emrserverless/pom.xml index 3a770bfffa79..0e5f2c2930ad 100644 --- a/services/emrserverless/pom.xml +++ b/services/emrserverless/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>emrserverless</artifactId> <name>AWS Java SDK :: Services :: EMR Serverless</name> diff --git a/services/entityresolution/pom.xml b/services/entityresolution/pom.xml index 0f0619de228c..a2ce2b90339e 100644 --- a/services/entityresolution/pom.xml +++ b/services/entityresolution/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>entityresolution</artifactId> <name>AWS Java SDK :: Services :: Entity Resolution</name> diff --git a/services/eventbridge/pom.xml b/services/eventbridge/pom.xml index ca61834e4303..a1b3f10b0a6a 100644 --- a/services/eventbridge/pom.xml +++ b/services/eventbridge/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>eventbridge</artifactId> <name>AWS Java SDK :: Services :: EventBridge</name> diff --git a/services/evidently/pom.xml b/services/evidently/pom.xml index 9fe46dafe2f4..927cf5033867 100644 --- a/services/evidently/pom.xml +++ b/services/evidently/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>evidently</artifactId> <name>AWS Java SDK :: Services :: Evidently</name> diff --git a/services/finspace/pom.xml b/services/finspace/pom.xml index 4904980a125c..af44faa32df9 100644 --- a/services/finspace/pom.xml +++ b/services/finspace/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>finspace</artifactId> <name>AWS Java SDK :: Services :: Finspace</name> diff --git a/services/finspacedata/pom.xml b/services/finspacedata/pom.xml index 9a550ea81f02..3ad81c175d39 100644 --- a/services/finspacedata/pom.xml +++ b/services/finspacedata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>finspacedata</artifactId> <name>AWS Java SDK :: Services :: Finspace Data</name> diff --git a/services/firehose/pom.xml b/services/firehose/pom.xml index f4a1e8b211c5..98594616684e 100644 --- a/services/firehose/pom.xml +++ b/services/firehose/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>firehose</artifactId> <name>AWS Java SDK :: Services :: Amazon Kinesis Firehose</name> diff --git a/services/firehose/src/main/resources/codegen-resources/service-2.json b/services/firehose/src/main/resources/codegen-resources/service-2.json index 646a6268014b..5c6548c588f4 100644 --- a/services/firehose/src/main/resources/codegen-resources/service-2.json +++ b/services/firehose/src/main/resources/codegen-resources/service-2.json @@ -5,6 +5,7 @@ "endpointPrefix":"firehose", "jsonVersion":"1.1", "protocol":"json", + "protocols":["json"], "serviceAbbreviation":"Firehose", "serviceFullName":"Amazon Kinesis Firehose", "serviceId":"Firehose", @@ -130,7 +131,7 @@ {"shape":"LimitExceededException"}, {"shape":"InvalidKMSResourceException"} ], - "documentation":"<p>Enables server-side encryption (SSE) for the delivery stream. </p> <p>This operation is asynchronous. It returns immediately. When you invoke it, Firehose first sets the encryption status of the stream to <code>ENABLING</code>, and then to <code>ENABLED</code>. The encryption status of a delivery stream is the <code>Status</code> property in <a>DeliveryStreamEncryptionConfiguration</a>. If the operation fails, the encryption status changes to <code>ENABLING_FAILED</code>. You can continue to read and write data to your delivery stream while the encryption status is <code>ENABLING</code>, but the data is not encrypted. It can take up to 5 seconds after the encryption status changes to <code>ENABLED</code> before all records written to the delivery stream are encrypted. To find out whether a record or a batch of records was encrypted, check the response elements <a>PutRecordOutput$Encrypted</a> and <a>PutRecordBatchOutput$Encrypted</a>, respectively.</p> <p>To check the encryption status of a delivery stream, use <a>DescribeDeliveryStream</a>.</p> <p>Even if encryption is currently enabled for a delivery stream, you can still invoke this operation on it to change the ARN of the CMK or both its type and ARN. If you invoke this method to change the CMK, and the old CMK is of type <code>CUSTOMER_MANAGED_CMK</code>, Firehose schedules the grant it had on the old CMK for retirement. If the new CMK is of type <code>CUSTOMER_MANAGED_CMK</code>, Firehose creates a grant that enables it to use the new CMK to encrypt and decrypt data and to manage the grant.</p> <p>For the KMS grant creation to be successful, Firehose APIs <code>StartDeliveryStreamEncryption</code> and <code>CreateDeliveryStream</code> should not be called with session credentials that are more than 6 hours old.</p> <p>If a delivery stream already has encryption enabled and then you invoke this operation to change the ARN of the CMK or both its type and ARN and you get <code>ENABLING_FAILED</code>, this only means that the attempt to change the CMK failed. In this case, encryption remains enabled with the old CMK.</p> <p>If the encryption status of your delivery stream is <code>ENABLING_FAILED</code>, you can invoke this operation again with a valid CMK. The CMK must be enabled and the key policy mustn't explicitly deny the permission for Firehose to invoke KMS encrypt and decrypt operations.</p> <p>You can enable SSE for a delivery stream only if it's a delivery stream that uses <code>DirectPut</code> as its source. </p> <p>The <code>StartDeliveryStreamEncryption</code> and <code>StopDeliveryStreamEncryption</code> operations have a combined limit of 25 calls per delivery stream per 24 hours. For example, you reach the limit if you call <code>StartDeliveryStreamEncryption</code> 13 times and <code>StopDeliveryStreamEncryption</code> 12 times for the same delivery stream in a 24-hour period.</p>" + "documentation":"<p>Enables server-side encryption (SSE) for the delivery stream. </p> <p>This operation is asynchronous. It returns immediately. When you invoke it, Firehose first sets the encryption status of the stream to <code>ENABLING</code>, and then to <code>ENABLED</code>. The encryption status of a delivery stream is the <code>Status</code> property in <a>DeliveryStreamEncryptionConfiguration</a>. If the operation fails, the encryption status changes to <code>ENABLING_FAILED</code>. You can continue to read and write data to your delivery stream while the encryption status is <code>ENABLING</code>, but the data is not encrypted. It can take up to 5 seconds after the encryption status changes to <code>ENABLED</code> before all records written to the delivery stream are encrypted. To find out whether a record or a batch of records was encrypted, check the response elements <a>PutRecordOutput$Encrypted</a> and <a>PutRecordBatchOutput$Encrypted</a>, respectively.</p> <p>To check the encryption status of a delivery stream, use <a>DescribeDeliveryStream</a>.</p> <p>Even if encryption is currently enabled for a delivery stream, you can still invoke this operation on it to change the ARN of the CMK or both its type and ARN. If you invoke this method to change the CMK, and the old CMK is of type <code>CUSTOMER_MANAGED_CMK</code>, Firehose schedules the grant it had on the old CMK for retirement. If the new CMK is of type <code>CUSTOMER_MANAGED_CMK</code>, Firehose creates a grant that enables it to use the new CMK to encrypt and decrypt data and to manage the grant.</p> <p>For the KMS grant creation to be successful, the Firehose API operations <code>StartDeliveryStreamEncryption</code> and <code>CreateDeliveryStream</code> should not be called with session credentials that are more than 6 hours old.</p> <p>If a delivery stream already has encryption enabled and then you invoke this operation to change the ARN of the CMK or both its type and ARN and you get <code>ENABLING_FAILED</code>, this only means that the attempt to change the CMK failed. In this case, encryption remains enabled with the old CMK.</p> <p>If the encryption status of your delivery stream is <code>ENABLING_FAILED</code>, you can invoke this operation again with a valid CMK. The CMK must be enabled and the key policy mustn't explicitly deny the permission for Firehose to invoke KMS encrypt and decrypt operations.</p> <p>You can enable SSE for a delivery stream only if it's a delivery stream that uses <code>DirectPut</code> as its source. </p> <p>The <code>StartDeliveryStreamEncryption</code> and <code>StopDeliveryStreamEncryption</code> operations have a combined limit of 25 calls per delivery stream per 24 hours. For example, you reach the limit if you call <code>StartDeliveryStreamEncryption</code> 13 times and <code>StopDeliveryStreamEncryption</code> 12 times for the same delivery stream in a 24-hour period.</p>" }, "StopDeliveryStreamEncryption":{ "name":"StopDeliveryStreamEncryption", @@ -1842,7 +1843,7 @@ "CloudWatchLoggingOptions":{"shape":"CloudWatchLoggingOptions"}, "RequestConfiguration":{ "shape":"HttpEndpointRequestConfiguration", - "documentation":"<p>The configuration of the requeste sent to the HTTP endpoint specified as the destination.</p>" + "documentation":"<p>The configuration of the request sent to the HTTP endpoint that is specified as the destination.</p>" }, "ProcessingConfiguration":{"shape":"ProcessingConfiguration"}, "RoleARN":{ @@ -1857,7 +1858,11 @@ "shape":"HttpEndpointS3BackupMode", "documentation":"<p>Describes the S3 bucket backup options for the data that Firehose delivers to the HTTP endpoint destination. You can back up all documents (<code>AllData</code>) or only the documents that Firehose could not deliver to the specified HTTP endpoint destination (<code>FailedDataOnly</code>).</p>" }, - "S3Configuration":{"shape":"S3DestinationConfiguration"} + "S3Configuration":{"shape":"S3DestinationConfiguration"}, + "SecretsManagerConfiguration":{ + "shape":"SecretsManagerConfiguration", + "documentation":"<p> The configuration that defines how you access secrets for HTTP Endpoint destination. </p>" + } }, "documentation":"<p>Describes the configuration of the HTTP endpoint destination.</p>" }, @@ -1890,7 +1895,11 @@ "shape":"HttpEndpointS3BackupMode", "documentation":"<p>Describes the S3 bucket backup options for the data that Kinesis Firehose delivers to the HTTP endpoint destination. You can back up all documents (<code>AllData</code>) or only the documents that Firehose could not deliver to the specified HTTP endpoint destination (<code>FailedDataOnly</code>).</p>" }, - "S3DestinationDescription":{"shape":"S3DestinationDescription"} + "S3DestinationDescription":{"shape":"S3DestinationDescription"}, + "SecretsManagerConfiguration":{ + "shape":"SecretsManagerConfiguration", + "documentation":"<p> The configuration that defines how you access secrets for HTTP Endpoint destination. </p>" + } }, "documentation":"<p>Describes the HTTP endpoint destination.</p>" }, @@ -1923,7 +1932,11 @@ "shape":"HttpEndpointS3BackupMode", "documentation":"<p>Describes the S3 bucket backup options for the data that Kinesis Firehose delivers to the HTTP endpoint destination. You can back up all documents (<code>AllData</code>) or only the documents that Firehose could not deliver to the specified HTTP endpoint destination (<code>FailedDataOnly</code>).</p>" }, - "S3Update":{"shape":"S3DestinationUpdate"} + "S3Update":{"shape":"S3DestinationUpdate"}, + "SecretsManagerConfiguration":{ + "shape":"SecretsManagerConfiguration", + "documentation":"<p> The configuration that defines how you access secrets for HTTP Endpoint destination. </p>" + } }, "documentation":"<p>Updates the specified HTTP endpoint destination.</p>" }, @@ -2404,7 +2417,7 @@ "documentation":"<p>Indicates the version of row format to output. The possible values are <code>V1</code> and <code>V2</code>. The default is <code>V1</code>.</p>" } }, - "documentation":"<p>A serializer to use for converting data to the Parquet format before storing it in Amazon S3. For more information, see <a href=\"https://parquet.apache.org/documentation/latest/\">Apache Parquet</a>.</p>" + "documentation":"<p>A serializer to use for converting data to the Parquet format before storing it in Amazon S3. For more information, see <a href=\"https://parquet.apache.org/docs/\">Apache Parquet</a>.</p>" }, "ParquetWriterVersion":{ "type":"string", @@ -2639,8 +2652,6 @@ "RoleARN", "ClusterJDBCURL", "CopyCommand", - "Username", - "Password", "S3Configuration" ], "members":{ @@ -2687,6 +2698,10 @@ "CloudWatchLoggingOptions":{ "shape":"CloudWatchLoggingOptions", "documentation":"<p>The CloudWatch logging options for your delivery stream.</p>" + }, + "SecretsManagerConfiguration":{ + "shape":"SecretsManagerConfiguration", + "documentation":"<p> The configuration that defines how you access secrets for Amazon Redshift. </p>" } }, "documentation":"<p>Describes the configuration of a destination in Amazon Redshift.</p>" @@ -2697,7 +2712,6 @@ "RoleARN", "ClusterJDBCURL", "CopyCommand", - "Username", "S3DestinationDescription" ], "members":{ @@ -2740,6 +2754,10 @@ "CloudWatchLoggingOptions":{ "shape":"CloudWatchLoggingOptions", "documentation":"<p>The Amazon CloudWatch logging options for your delivery stream.</p>" + }, + "SecretsManagerConfiguration":{ + "shape":"SecretsManagerConfiguration", + "documentation":"<p> The configuration that defines how you access secrets for Amazon Redshift. </p>" } }, "documentation":"<p>Describes a destination in Amazon Redshift.</p>" @@ -2790,6 +2808,10 @@ "CloudWatchLoggingOptions":{ "shape":"CloudWatchLoggingOptions", "documentation":"<p>The Amazon CloudWatch logging options for your delivery stream.</p>" + }, + "SecretsManagerConfiguration":{ + "shape":"SecretsManagerConfiguration", + "documentation":"<p> The configuration that defines how you access secrets for Amazon Redshift. </p>" } }, "documentation":"<p>Describes an update for a destination in Amazon Redshift.</p>" @@ -3021,6 +3043,31 @@ }, "documentation":"<p>Specifies the schema to which you want Firehose to configure your data before it writes it to Amazon S3. This parameter is required if <code>Enabled</code> is set to true.</p>" }, + "SecretARN":{ + "type":"string", + "max":2048, + "min":1, + "pattern":"arn:.*" + }, + "SecretsManagerConfiguration":{ + "type":"structure", + "required":["Enabled"], + "members":{ + "SecretARN":{ + "shape":"SecretARN", + "documentation":"<p>The ARN of the secret that stores your credentials. It must be in the same region as the Firehose stream and the role. The secret ARN can reside in a different account than the delivery stream and role as Firehose supports cross-account secret access. This parameter is required when <b>Enabled</b> is set to <code>True</code>.</p>" + }, + "RoleARN":{ + "shape":"RoleARN", + "documentation":"<p> Specifies the role that Firehose assumes when calling the Secrets Manager API operation. When you provide the role, it overrides any destination specific role defined in the destination configuration. If you do not provide the then we use the destination specific role. This parameter is required for Splunk. </p>" + }, + "Enabled":{ + "shape":"BooleanObject", + "documentation":"<p>Specifies whether you want to use the the secrets manager feature. When set as <code>True</code> the secrets manager configuration overwrites the existing secrets in the destination configuration. When it's set to <code>False</code> Firehose falls back to the credentials in the destination configuration.</p>" + } + }, + "documentation":"<p>The structure that defines how Firehose accesses the secret.</p>" + }, "SecurityGroupIdList":{ "type":"list", "member":{"shape":"NonEmptyStringWithoutWhitespace"}, @@ -3089,8 +3136,6 @@ "type":"structure", "required":[ "AccountUrl", - "PrivateKey", - "User", "Database", "Schema", "Table", @@ -3160,7 +3205,11 @@ "shape":"SnowflakeS3BackupMode", "documentation":"<p>Choose an S3 backup mode</p>" }, - "S3Configuration":{"shape":"S3DestinationConfiguration"} + "S3Configuration":{"shape":"S3DestinationConfiguration"}, + "SecretsManagerConfiguration":{ + "shape":"SecretsManagerConfiguration", + "documentation":"<p> The configuration that defines how you access secrets for Snowflake. </p>" + } }, "documentation":"<p>Configure Snowflake destination</p>" }, @@ -3221,7 +3270,11 @@ "shape":"SnowflakeS3BackupMode", "documentation":"<p>Choose an S3 backup mode</p>" }, - "S3DestinationDescription":{"shape":"S3DestinationDescription"} + "S3DestinationDescription":{"shape":"S3DestinationDescription"}, + "SecretsManagerConfiguration":{ + "shape":"SecretsManagerConfiguration", + "documentation":"<p> The configuration that defines how you access secrets for Snowflake. </p>" + } }, "documentation":"<p>Optional Snowflake destination description</p>" }, @@ -3286,7 +3339,11 @@ "shape":"SnowflakeS3BackupMode", "documentation":"<p>Choose an S3 backup mode</p>" }, - "S3Update":{"shape":"S3DestinationUpdate"} + "S3Update":{"shape":"S3DestinationUpdate"}, + "SecretsManagerConfiguration":{ + "shape":"SecretsManagerConfiguration", + "documentation":"<p> Describes the Secrets Manager configuration in Snowflake. </p>" + } }, "documentation":"<p>Update to configuration settings</p>" }, @@ -3430,7 +3487,6 @@ "required":[ "HECEndpoint", "HECEndpointType", - "HECToken", "S3Configuration" ], "members":{ @@ -3473,6 +3529,10 @@ "BufferingHints":{ "shape":"SplunkBufferingHints", "documentation":"<p>The buffering options. If no value is specified, the default values for Splunk are used.</p>" + }, + "SecretsManagerConfiguration":{ + "shape":"SecretsManagerConfiguration", + "documentation":"<p> The configuration that defines how you access secrets for Splunk. </p>" } }, "documentation":"<p>Describes the configuration of a destination in Splunk.</p>" @@ -3519,6 +3579,10 @@ "BufferingHints":{ "shape":"SplunkBufferingHints", "documentation":"<p>The buffering options. If no value is specified, the default values for Splunk are used.</p>" + }, + "SecretsManagerConfiguration":{ + "shape":"SecretsManagerConfiguration", + "documentation":"<p> The configuration that defines how you access secrets for Splunk. </p>" } }, "documentation":"<p>Describes a destination in Splunk.</p>" @@ -3565,6 +3629,10 @@ "BufferingHints":{ "shape":"SplunkBufferingHints", "documentation":"<p>The buffering options. If no value is specified, the default values for Splunk are used.</p>" + }, + "SecretsManagerConfiguration":{ + "shape":"SecretsManagerConfiguration", + "documentation":"<p> The configuration that defines how you access secrets for Splunk. </p>" } }, "documentation":"<p>Describes an update for a destination in Splunk.</p>" @@ -3776,7 +3844,7 @@ }, "SnowflakeDestinationUpdate":{ "shape":"SnowflakeDestinationUpdate", - "documentation":"<p>Update to the Snowflake destination condiguration settings</p>" + "documentation":"<p>Update to the Snowflake destination configuration settings.</p>" } } }, @@ -3844,5 +3912,5 @@ "documentation":"<p>The details of the VPC of the Amazon ES destination.</p>" } }, - "documentation":"<fullname>Amazon Data Firehose</fullname> <note> <p>Amazon Data Firehose was previously known as Amazon Kinesis Data Firehose.</p> </note> <p>Amazon Data Firehose is a fully managed service that delivers real-time streaming data to destinations such as Amazon Simple Storage Service (Amazon S3), Amazon OpenSearch Service, Amazon Redshift, Splunk, and various other supportd destinations.</p>" + "documentation":"<fullname>Amazon Data Firehose</fullname> <note> <p>Amazon Data Firehose was previously known as Amazon Kinesis Data Firehose.</p> </note> <p>Amazon Data Firehose is a fully managed service that delivers real-time streaming data to destinations such as Amazon Simple Storage Service (Amazon S3), Amazon OpenSearch Service, Amazon Redshift, Splunk, and various other supported destinations.</p>" } diff --git a/services/fis/pom.xml b/services/fis/pom.xml index 9374deab79af..4df041c51383 100644 --- a/services/fis/pom.xml +++ b/services/fis/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>fis</artifactId> <name>AWS Java SDK :: Services :: Fis</name> diff --git a/services/fms/pom.xml b/services/fms/pom.xml index d19839c325b2..e0ed630fe551 100644 --- a/services/fms/pom.xml +++ b/services/fms/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>fms</artifactId> <name>AWS Java SDK :: Services :: FMS</name> diff --git a/services/forecast/pom.xml b/services/forecast/pom.xml index ac9d9b86931c..4a68a9f4af6a 100644 --- a/services/forecast/pom.xml +++ b/services/forecast/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>forecast</artifactId> <name>AWS Java SDK :: Services :: Forecast</name> diff --git a/services/forecastquery/pom.xml b/services/forecastquery/pom.xml index 6435a7751f5b..2f4f8a458931 100644 --- a/services/forecastquery/pom.xml +++ b/services/forecastquery/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>forecastquery</artifactId> <name>AWS Java SDK :: Services :: Forecastquery</name> diff --git a/services/frauddetector/pom.xml b/services/frauddetector/pom.xml index 3cbd7db24b19..643bd874b0b7 100644 --- a/services/frauddetector/pom.xml +++ b/services/frauddetector/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>frauddetector</artifactId> <name>AWS Java SDK :: Services :: FraudDetector</name> diff --git a/services/freetier/pom.xml b/services/freetier/pom.xml index b501943010ea..dd505d837fed 100644 --- a/services/freetier/pom.xml +++ b/services/freetier/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>freetier</artifactId> <name>AWS Java SDK :: Services :: Free Tier</name> diff --git a/services/fsx/pom.xml b/services/fsx/pom.xml index abd02506c1fc..8bc234b66094 100644 --- a/services/fsx/pom.xml +++ b/services/fsx/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>fsx</artifactId> <name>AWS Java SDK :: Services :: FSx</name> diff --git a/services/fsx/src/main/resources/codegen-resources/service-2.json b/services/fsx/src/main/resources/codegen-resources/service-2.json index a26b252ce26f..3d15bca4b38b 100644 --- a/services/fsx/src/main/resources/codegen-resources/service-2.json +++ b/services/fsx/src/main/resources/codegen-resources/service-2.json @@ -5,6 +5,7 @@ "endpointPrefix":"fsx", "jsonVersion":"1.1", "protocol":"json", + "protocols":["json"], "serviceFullName":"Amazon FSx", "serviceId":"FSx", "signatureVersion":"v4", @@ -187,7 +188,7 @@ {"shape":"InternalServerError"}, {"shape":"MissingFileSystemConfiguration"} ], - "documentation":"<p>Creates a new, empty Amazon FSx file system. You can create the following supported Amazon FSx file systems using the <code>CreateFileSystem</code> API operation:</p> <ul> <li> <p>Amazon FSx for Lustre</p> </li> <li> <p>Amazon FSx for NetApp ONTAP</p> </li> <li> <p>Amazon FSx for OpenZFS</p> </li> <li> <p>Amazon FSx for Windows File Server</p> </li> </ul> <p>This operation requires a client request token in the request that Amazon FSx uses to ensure idempotent creation. This means that calling the operation multiple times with the same client request token has no effect. By using the idempotent operation, you can retry a <code>CreateFileSystem</code> operation without the risk of creating an extra file system. This approach can be useful when an initial call fails in a way that makes it unclear whether a file system was created. Examples are if a transport level timeout occurred, or your connection was reset. If you use the same client request token and the initial call created a file system, the client receives success as long as the parameters are the same.</p> <p>If a file system with the specified client request token exists and the parameters match, <code>CreateFileSystem</code> returns the description of the existing file system. If a file system with the specified client request token exists and the parameters don't match, this call returns <code>IncompatibleParameterError</code>. If a file system with the specified client request token doesn't exist, <code>CreateFileSystem</code> does the following: </p> <ul> <li> <p>Creates a new, empty Amazon FSx file system with an assigned ID, and an initial lifecycle state of <code>CREATING</code>.</p> </li> <li> <p>Returns the description of the file system in JSON format.</p> </li> </ul> <note> <p>The <code>CreateFileSystem</code> call returns while the file system's lifecycle state is still <code>CREATING</code>. You can check the file-system creation status by calling the <a href=\"https://docs.aws.amazon.com/fsx/latest/APIReference/API_DescribeFileSystems.html\">DescribeFileSystems</a> operation, which returns the file system state along with other information.</p> </note>" + "documentation":"<p>Creates a new, empty Amazon FSx file system. You can create the following supported Amazon FSx file systems using the <code>CreateFileSystem</code> API operation:</p> <ul> <li> <p>Amazon FSx for Lustre</p> </li> <li> <p>Amazon FSx for NetApp ONTAP</p> </li> <li> <p>Amazon FSx for OpenZFS</p> </li> <li> <p>Amazon FSx for Windows File Server</p> </li> </ul> <p>This operation requires a client request token in the request that Amazon FSx uses to ensure idempotent creation. This means that calling the operation multiple times with the same client request token has no effect. By using the idempotent operation, you can retry a <code>CreateFileSystem</code> operation without the risk of creating an extra file system. This approach can be useful when an initial call fails in a way that makes it unclear whether a file system was created. Examples are if a transport level timeout occurred, or your connection was reset. If you use the same client request token and the initial call created a file system, the client receives success as long as the parameters are the same.</p> <p>If a file system with the specified client request token exists and the parameters match, <code>CreateFileSystem</code> returns the description of the existing file system. If a file system with the specified client request token exists and the parameters don't match, this call returns <code>IncompatibleParameterError</code>. If a file system with the specified client request token doesn't exist, <code>CreateFileSystem</code> does the following:</p> <ul> <li> <p>Creates a new, empty Amazon FSx file system with an assigned ID, and an initial lifecycle state of <code>CREATING</code>.</p> </li> <li> <p>Returns the description of the file system in JSON format.</p> </li> </ul> <note> <p>The <code>CreateFileSystem</code> call returns while the file system's lifecycle state is still <code>CREATING</code>. You can check the file-system creation status by calling the <a href=\"https://docs.aws.amazon.com/fsx/latest/APIReference/API_DescribeFileSystems.html\">DescribeFileSystems</a> operation, which returns the file system state along with other information.</p> </note>" }, "CreateFileSystemFromBackup":{ "name":"CreateFileSystemFromBackup", @@ -357,7 +358,7 @@ {"shape":"ServiceLimitExceeded"}, {"shape":"InternalServerError"} ], - "documentation":"<p>Deletes a file system. After deletion, the file system no longer exists, and its data is gone. Any existing automatic backups and snapshots are also deleted.</p> <p>To delete an Amazon FSx for NetApp ONTAP file system, first delete all the volumes and storage virtual machines (SVMs) on the file system. Then provide a <code>FileSystemId</code> value to the <code>DeleFileSystem</code> operation.</p> <p>By default, when you delete an Amazon FSx for Windows File Server file system, a final backup is created upon deletion. This final backup isn't subject to the file system's retention policy, and must be manually deleted.</p> <p>To delete an Amazon FSx for Lustre file system, first <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/unmounting-fs.html\">unmount</a> it from every connected Amazon EC2 instance, then provide a <code>FileSystemId</code> value to the <code>DeleFileSystem</code> operation. By default, Amazon FSx will not take a final backup when the <code>DeleteFileSystem</code> operation is invoked. On file systems not linked to an Amazon S3 bucket, set <code>SkipFinalBackup</code> to <code>false</code> to take a final backup of the file system you are deleting. Backups cannot be enabled on S3-linked file systems. To ensure all of your data is written back to S3 before deleting your file system, you can either monitor for the <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/monitoring-cloudwatch.html#auto-import-export-metrics\">AgeOfOldestQueuedMessage</a> metric to be zero (if using automatic export) or you can run an <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/export-data-repo-task-dra.html\">export data repository task</a>. If you have automatic export enabled and want to use an export data repository task, you have to disable automatic export before executing the export data repository task.</p> <p>The <code>DeleteFileSystem</code> operation returns while the file system has the <code>DELETING</code> status. You can check the file system deletion status by calling the <a href=\"https://docs.aws.amazon.com/fsx/latest/APIReference/API_DescribeFileSystems.html\">DescribeFileSystems</a> operation, which returns a list of file systems in your account. If you pass the file system ID for a deleted file system, the <code>DescribeFileSystems</code> operation returns a <code>FileSystemNotFound</code> error.</p> <note> <p>If a data repository task is in a <code>PENDING</code> or <code>EXECUTING</code> state, deleting an Amazon FSx for Lustre file system will fail with an HTTP status code 400 (Bad Request).</p> </note> <important> <p>The data in a deleted file system is also deleted and can't be recovered by any means.</p> </important>", + "documentation":"<p>Deletes a file system. After deletion, the file system no longer exists, and its data is gone. Any existing automatic backups and snapshots are also deleted.</p> <p>To delete an Amazon FSx for NetApp ONTAP file system, first delete all the volumes and storage virtual machines (SVMs) on the file system. Then provide a <code>FileSystemId</code> value to the <code>DeleteFileSystem</code> operation.</p> <p>By default, when you delete an Amazon FSx for Windows File Server file system, a final backup is created upon deletion. This final backup isn't subject to the file system's retention policy, and must be manually deleted.</p> <p>To delete an Amazon FSx for Lustre file system, first <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/unmounting-fs.html\">unmount</a> it from every connected Amazon EC2 instance, then provide a <code>FileSystemId</code> value to the <code>DeleteFileSystem</code> operation. By default, Amazon FSx will not take a final backup when the <code>DeleteFileSystem</code> operation is invoked. On file systems not linked to an Amazon S3 bucket, set <code>SkipFinalBackup</code> to <code>false</code> to take a final backup of the file system you are deleting. Backups cannot be enabled on S3-linked file systems. To ensure all of your data is written back to S3 before deleting your file system, you can either monitor for the <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/monitoring-cloudwatch.html#auto-import-export-metrics\">AgeOfOldestQueuedMessage</a> metric to be zero (if using automatic export) or you can run an <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/export-data-repo-task-dra.html\">export data repository task</a>. If you have automatic export enabled and want to use an export data repository task, you have to disable automatic export before executing the export data repository task.</p> <p>The <code>DeleteFileSystem</code> operation returns while the file system has the <code>DELETING</code> status. You can check the file system deletion status by calling the <a href=\"https://docs.aws.amazon.com/fsx/latest/APIReference/API_DescribeFileSystems.html\">DescribeFileSystems</a> operation, which returns a list of file systems in your account. If you pass the file system ID for a deleted file system, the <code>DescribeFileSystems</code> operation returns a <code>FileSystemNotFound</code> error.</p> <note> <p>If a data repository task is in a <code>PENDING</code> or <code>EXECUTING</code> state, deleting an Amazon FSx for Lustre file system will fail with an HTTP status code 400 (Bad Request).</p> </note> <important> <p>The data in a deleted file system is also deleted and can't be recovered by any means.</p> </important>", "idempotent":true }, "DeleteSnapshot":{ @@ -738,7 +739,7 @@ {"shape":"MissingFileSystemConfiguration"}, {"shape":"ServiceLimitExceeded"} ], - "documentation":"<p>Use this operation to update the configuration of an existing Amazon FSx file system. You can update multiple properties in a single request.</p> <p>For FSx for Windows File Server file systems, you can update the following properties:</p> <ul> <li> <p> <code>AuditLogConfiguration</code> </p> </li> <li> <p> <code>AutomaticBackupRetentionDays</code> </p> </li> <li> <p> <code>DailyAutomaticBackupStartTime</code> </p> </li> <li> <p> <code>SelfManagedActiveDirectoryConfiguration</code> </p> </li> <li> <p> <code>StorageCapacity</code> </p> </li> <li> <p> <code>StorageType</code> </p> </li> <li> <p> <code>ThroughputCapacity</code> </p> </li> <li> <p> <code>DiskIopsConfiguration</code> </p> </li> <li> <p> <code>WeeklyMaintenanceStartTime</code> </p> </li> </ul> <p>For FSx for Lustre file systems, you can update the following properties:</p> <ul> <li> <p> <code>AutoImportPolicy</code> </p> </li> <li> <p> <code>AutomaticBackupRetentionDays</code> </p> </li> <li> <p> <code>DailyAutomaticBackupStartTime</code> </p> </li> <li> <p> <code>DataCompressionType</code> </p> </li> <li> <p> <code>LogConfiguration</code> </p> </li> <li> <p> <code>LustreRootSquashConfiguration</code> </p> </li> <li> <p> <code>PerUnitStorageThroughput</code> </p> </li> <li> <p> <code>StorageCapacity</code> </p> </li> <li> <p> <code>WeeklyMaintenanceStartTime</code> </p> </li> </ul> <p>For FSx for ONTAP file systems, you can update the following properties:</p> <ul> <li> <p> <code>AddRouteTableIds</code> </p> </li> <li> <p> <code>AutomaticBackupRetentionDays</code> </p> </li> <li> <p> <code>DailyAutomaticBackupStartTime</code> </p> </li> <li> <p> <code>DiskIopsConfiguration</code> </p> </li> <li> <p> <code>FsxAdminPassword</code> </p> </li> <li> <p> <code>HAPairs</code> </p> </li> <li> <p> <code>RemoveRouteTableIds</code> </p> </li> <li> <p> <code>StorageCapacity</code> </p> </li> <li> <p> <code>ThroughputCapacity</code> </p> </li> <li> <p> <code>ThroughputCapacityPerHAPair</code> </p> </li> <li> <p> <code>WeeklyMaintenanceStartTime</code> </p> </li> </ul> <p>For FSx for OpenZFS file systems, you can update the following properties:</p> <ul> <li> <p> <code>AddRouteTableIds</code> </p> </li> <li> <p> <code>AutomaticBackupRetentionDays</code> </p> </li> <li> <p> <code>CopyTagsToBackups</code> </p> </li> <li> <p> <code>CopyTagsToVolumes</code> </p> </li> <li> <p> <code>DailyAutomaticBackupStartTime</code> </p> </li> <li> <p> <code>DiskIopsConfiguration</code> </p> </li> <li> <p> <code>RemoveRouteTableIds</code> </p> </li> <li> <p> <code>StorageCapacity</code> </p> </li> <li> <p> <code>ThroughputCapacity</code> </p> </li> <li> <p> <code>WeeklyMaintenanceStartTime</code> </p> </li> </ul>" + "documentation":"<p>Use this operation to update the configuration of an existing Amazon FSx file system. You can update multiple properties in a single request.</p> <p>For FSx for Windows File Server file systems, you can update the following properties:</p> <ul> <li> <p> <code>AuditLogConfiguration</code> </p> </li> <li> <p> <code>AutomaticBackupRetentionDays</code> </p> </li> <li> <p> <code>DailyAutomaticBackupStartTime</code> </p> </li> <li> <p> <code>SelfManagedActiveDirectoryConfiguration</code> </p> </li> <li> <p> <code>StorageCapacity</code> </p> </li> <li> <p> <code>StorageType</code> </p> </li> <li> <p> <code>ThroughputCapacity</code> </p> </li> <li> <p> <code>DiskIopsConfiguration</code> </p> </li> <li> <p> <code>WeeklyMaintenanceStartTime</code> </p> </li> </ul> <p>For FSx for Lustre file systems, you can update the following properties:</p> <ul> <li> <p> <code>AutoImportPolicy</code> </p> </li> <li> <p> <code>AutomaticBackupRetentionDays</code> </p> </li> <li> <p> <code>DailyAutomaticBackupStartTime</code> </p> </li> <li> <p> <code>DataCompressionType</code> </p> </li> <li> <p> <code>LogConfiguration</code> </p> </li> <li> <p> <code>LustreRootSquashConfiguration</code> </p> </li> <li> <p> <code>MetadataConfiguration</code> </p> </li> <li> <p> <code>PerUnitStorageThroughput</code> </p> </li> <li> <p> <code>StorageCapacity</code> </p> </li> <li> <p> <code>WeeklyMaintenanceStartTime</code> </p> </li> </ul> <p>For FSx for ONTAP file systems, you can update the following properties:</p> <ul> <li> <p> <code>AddRouteTableIds</code> </p> </li> <li> <p> <code>AutomaticBackupRetentionDays</code> </p> </li> <li> <p> <code>DailyAutomaticBackupStartTime</code> </p> </li> <li> <p> <code>DiskIopsConfiguration</code> </p> </li> <li> <p> <code>FsxAdminPassword</code> </p> </li> <li> <p> <code>HAPairs</code> </p> </li> <li> <p> <code>RemoveRouteTableIds</code> </p> </li> <li> <p> <code>StorageCapacity</code> </p> </li> <li> <p> <code>ThroughputCapacity</code> </p> </li> <li> <p> <code>ThroughputCapacityPerHAPair</code> </p> </li> <li> <p> <code>WeeklyMaintenanceStartTime</code> </p> </li> </ul> <p>For FSx for OpenZFS file systems, you can update the following properties:</p> <ul> <li> <p> <code>AddRouteTableIds</code> </p> </li> <li> <p> <code>AutomaticBackupRetentionDays</code> </p> </li> <li> <p> <code>CopyTagsToBackups</code> </p> </li> <li> <p> <code>CopyTagsToVolumes</code> </p> </li> <li> <p> <code>DailyAutomaticBackupStartTime</code> </p> </li> <li> <p> <code>DiskIopsConfiguration</code> </p> </li> <li> <p> <code>RemoveRouteTableIds</code> </p> </li> <li> <p> <code>StorageCapacity</code> </p> </li> <li> <p> <code>ThroughputCapacity</code> </p> </li> <li> <p> <code>WeeklyMaintenanceStartTime</code> </p> </li> </ul>" }, "UpdateSharedVpcConfiguration":{ "name":"UpdateSharedVpcConfiguration", @@ -1718,7 +1719,7 @@ }, "DeploymentType":{ "shape":"LustreDeploymentType", - "documentation":"<p>(Optional) Choose <code>SCRATCH_1</code> and <code>SCRATCH_2</code> deployment types when you need temporary storage and shorter-term processing of data. The <code>SCRATCH_2</code> deployment type provides in-transit encryption of data and higher burst throughput capacity than <code>SCRATCH_1</code>.</p> <p>Choose <code>PERSISTENT_1</code> for longer-term storage and for throughput-focused workloads that aren’t latency-sensitive. <code>PERSISTENT_1</code> supports encryption of data in transit, and is available in all Amazon Web Services Regions in which FSx for Lustre is available.</p> <p>Choose <code>PERSISTENT_2</code> for longer-term storage and for latency-sensitive workloads that require the highest levels of IOPS/throughput. <code>PERSISTENT_2</code> supports SSD storage, and offers higher <code>PerUnitStorageThroughput</code> (up to 1000 MB/s/TiB). <code>PERSISTENT_2</code> is available in a limited number of Amazon Web Services Regions. For more information, and an up-to-date list of Amazon Web Services Regions in which <code>PERSISTENT_2</code> is available, see <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/using-fsx-lustre.html#lustre-deployment-types\">File system deployment options for FSx for Lustre</a> in the <i>Amazon FSx for Lustre User Guide</i>.</p> <note> <p>If you choose <code>PERSISTENT_2</code>, and you set <code>FileSystemTypeVersion</code> to <code>2.10</code>, the <code>CreateFileSystem</code> operation fails.</p> </note> <p>Encryption of data in transit is automatically turned on when you access <code>SCRATCH_2</code>, <code>PERSISTENT_1</code> and <code>PERSISTENT_2</code> file systems from Amazon EC2 instances that support automatic encryption in the Amazon Web Services Regions where they are available. For more information about encryption in transit for FSx for Lustre file systems, see <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/encryption-in-transit-fsxl.html\">Encrypting data in transit</a> in the <i>Amazon FSx for Lustre User Guide</i>. </p> <p>(Default = <code>SCRATCH_1</code>)</p>" + "documentation":"<p>(Optional) Choose <code>SCRATCH_1</code> and <code>SCRATCH_2</code> deployment types when you need temporary storage and shorter-term processing of data. The <code>SCRATCH_2</code> deployment type provides in-transit encryption of data and higher burst throughput capacity than <code>SCRATCH_1</code>.</p> <p>Choose <code>PERSISTENT_1</code> for longer-term storage and for throughput-focused workloads that aren’t latency-sensitive. <code>PERSISTENT_1</code> supports encryption of data in transit, and is available in all Amazon Web Services Regions in which FSx for Lustre is available.</p> <p>Choose <code>PERSISTENT_2</code> for longer-term storage and for latency-sensitive workloads that require the highest levels of IOPS/throughput. <code>PERSISTENT_2</code> supports SSD storage, and offers higher <code>PerUnitStorageThroughput</code> (up to 1000 MB/s/TiB). You can optionally specify a metadata configuration mode for <code>PERSISTENT_2</code> which supports increasing metadata performance. <code>PERSISTENT_2</code> is available in a limited number of Amazon Web Services Regions. For more information, and an up-to-date list of Amazon Web Services Regions in which <code>PERSISTENT_2</code> is available, see <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/using-fsx-lustre.html#lustre-deployment-types\">File system deployment options for FSx for Lustre</a> in the <i>Amazon FSx for Lustre User Guide</i>.</p> <note> <p>If you choose <code>PERSISTENT_2</code>, and you set <code>FileSystemTypeVersion</code> to <code>2.10</code>, the <code>CreateFileSystem</code> operation fails.</p> </note> <p>Encryption of data in transit is automatically turned on when you access <code>SCRATCH_2</code>, <code>PERSISTENT_1</code>, and <code>PERSISTENT_2</code> file systems from Amazon EC2 instances that support automatic encryption in the Amazon Web Services Regions where they are available. For more information about encryption in transit for FSx for Lustre file systems, see <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/encryption-in-transit-fsxl.html\">Encrypting data in transit</a> in the <i>Amazon FSx for Lustre User Guide</i>.</p> <p>(Default = <code>SCRATCH_1</code>)</p>" }, "AutoImportPolicy":{ "shape":"AutoImportPolicyType", @@ -1752,10 +1753,29 @@ "RootSquashConfiguration":{ "shape":"LustreRootSquashConfiguration", "documentation":"<p>The Lustre root squash configuration used when creating an Amazon FSx for Lustre file system. When enabled, root squash restricts root-level access from clients that try to access your file system as a root user.</p>" + }, + "MetadataConfiguration":{ + "shape":"CreateFileSystemLustreMetadataConfiguration", + "documentation":"<p>The Lustre metadata performance configuration for the creation of an FSx for Lustre file system using a <code>PERSISTENT_2</code> deployment type.</p>" } }, "documentation":"<p>The Lustre configuration for the file system being created.</p> <note> <p>The following parameters are not supported for file systems with a data repository association created with .</p> <ul> <li> <p> <code>AutoImportPolicy</code> </p> </li> <li> <p> <code>ExportPath</code> </p> </li> <li> <p> <code>ImportedFileChunkSize</code> </p> </li> <li> <p> <code>ImportPath</code> </p> </li> </ul> </note>" }, + "CreateFileSystemLustreMetadataConfiguration":{ + "type":"structure", + "required":["Mode"], + "members":{ + "Iops":{ + "shape":"MetadataIops", + "documentation":"<p>(USER_PROVISIONED mode only) Specifies the number of Metadata IOPS to provision for the file system. This parameter sets the maximum rate of metadata disk IOPS supported by the file system. Valid values are <code>1500</code>, <code>3000</code>, <code>6000</code>, <code>12000</code>, and multiples of <code>12000</code> up to a maximum of <code>192000</code>.</p> <note> <p>Iops doesn’t have a default value. If you're using USER_PROVISIONED mode, you can choose to specify a valid value. If you're using AUTOMATIC mode, you cannot specify a value because FSx for Lustre automatically sets the value based on your file system storage capacity. </p> </note>" + }, + "Mode":{ + "shape":"MetadataConfigurationMode", + "documentation":"<p>The metadata configuration mode for provisioning Metadata IOPS for an FSx for Lustre file system using a <code>PERSISTENT_2</code> deployment type.</p> <ul> <li> <p>In AUTOMATIC mode, FSx for Lustre automatically provisions and scales the number of Metadata IOPS for your file system based on your file system storage capacity.</p> </li> <li> <p>In USER_PROVISIONED mode, you specify the number of Metadata IOPS to provision for your file system.</p> </li> </ul>" + } + }, + "documentation":"<p>The Lustre metadata performance configuration for the creation of an Amazon FSx for Lustre file system using a <code>PERSISTENT_2</code> deployment type. The configuration uses a Metadata IOPS value to set the maximum rate of metadata disk IOPS supported by the file system.</p> <p>After creation, the file system supports increasing metadata performance. For more information on Metadata IOPS, see <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/managing-metadata-performance.html#metadata-configuration\">Lustre metadata performance configuration</a> in the <i>Amazon FSx for Lustre User Guide</i>.</p>" + }, "CreateFileSystemOntapConfiguration":{ "type":"structure", "required":["DeploymentType"], @@ -1793,7 +1813,7 @@ "WeeklyMaintenanceStartTime":{"shape":"WeeklyTime"}, "HAPairs":{ "shape":"HAPairs", - "documentation":"<p>Specifies how many high-availability (HA) pairs of file servers will power your file system. Scale-up file systems are powered by 1 HA pair. The default value is 1. FSx for ONTAP scale-out file systems are powered by up to 12 HA pairs. The value of this property affects the values of <code>StorageCapacity</code>, <code>Iops</code>, and <code>ThroughputCapacity</code>. For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/HA-pairs.html\">High-availability (HA) pairs</a> in the FSx for ONTAP user guide.</p> <p>Amazon FSx responds with an HTTP status code 400 (Bad Request) for the following conditions:</p> <ul> <li> <p>The value of <code>HAPairs</code> is less than 1 or greater than 12.</p> </li> <li> <p>The value of <code>HAPairs</code> is greater than 1 and the value of <code>DeploymentType</code> is <code>SINGLE_AZ_1</code> or <code>MULTI_AZ_1</code>.</p> </li> </ul>" + "documentation":"<p>Specifies how many high-availability (HA) pairs of file servers will power your file system. Scale-up file systems are powered by 1 HA pair. The default value is 1. FSx for ONTAP scale-out file systems are powered by up to 12 HA pairs. The value of this property affects the values of <code>StorageCapacity</code>, <code>Iops</code>, and <code>ThroughputCapacity</code>. For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/administering-file-systems.html#HA-pairs\">High-availability (HA) pairs</a> in the FSx for ONTAP user guide.</p> <p>Amazon FSx responds with an HTTP status code 400 (Bad Request) for the following conditions:</p> <ul> <li> <p>The value of <code>HAPairs</code> is less than 1 or greater than 12.</p> </li> <li> <p>The value of <code>HAPairs</code> is greater than 1 and the value of <code>DeploymentType</code> is <code>SINGLE_AZ_1</code> or <code>MULTI_AZ_1</code>.</p> </li> </ul>" }, "ThroughputCapacityPerHAPair":{ "shape":"ThroughputCapacityPerHAPair", @@ -1867,11 +1887,11 @@ }, "StorageCapacity":{ "shape":"StorageCapacity", - "documentation":"<p>Sets the storage capacity of the file system that you're creating, in gibibytes (GiB).</p> <p> <b>FSx for Lustre file systems</b> - The amount of storage capacity that you can configure depends on the value that you set for <code>StorageType</code> and the Lustre <code>DeploymentType</code>, as follows:</p> <ul> <li> <p>For <code>SCRATCH_2</code>, <code>PERSISTENT_2</code> and <code>PERSISTENT_1</code> deployment types using SSD storage type, the valid values are 1200 GiB, 2400 GiB, and increments of 2400 GiB.</p> </li> <li> <p>For <code>PERSISTENT_1</code> HDD file systems, valid values are increments of 6000 GiB for 12 MB/s/TiB file systems and increments of 1800 GiB for 40 MB/s/TiB file systems.</p> </li> <li> <p>For <code>SCRATCH_1</code> deployment type, valid values are 1200 GiB, 2400 GiB, and increments of 3600 GiB.</p> </li> </ul> <p> <b>FSx for ONTAP file systems</b> - The amount of storage capacity that you can configure depends on the value of the <code>HAPairs</code> property. The minimum value is calculated as 1,024 * <code>HAPairs</code> and the maximum is calculated as 524,288 * <code>HAPairs</code>. </p> <p> <b>FSx for OpenZFS file systems</b> - The amount of storage capacity that you can configure is from 64 GiB up to 524,288 GiB (512 TiB).</p> <p> <b>FSx for Windows File Server file systems</b> - The amount of storage capacity that you can configure depends on the value that you set for <code>StorageType</code> as follows:</p> <ul> <li> <p>For SSD storage, valid values are 32 GiB-65,536 GiB (64 TiB).</p> </li> <li> <p>For HDD storage, valid values are 2000 GiB-65,536 GiB (64 TiB).</p> </li> </ul>" + "documentation":"<p>Sets the storage capacity of the file system that you're creating, in gibibytes (GiB).</p> <p> <b>FSx for Lustre file systems</b> - The amount of storage capacity that you can configure depends on the value that you set for <code>StorageType</code> and the Lustre <code>DeploymentType</code>, as follows:</p> <ul> <li> <p>For <code>SCRATCH_2</code>, <code>PERSISTENT_2</code>, and <code>PERSISTENT_1</code> deployment types using SSD storage type, the valid values are 1200 GiB, 2400 GiB, and increments of 2400 GiB.</p> </li> <li> <p>For <code>PERSISTENT_1</code> HDD file systems, valid values are increments of 6000 GiB for 12 MB/s/TiB file systems and increments of 1800 GiB for 40 MB/s/TiB file systems.</p> </li> <li> <p>For <code>SCRATCH_1</code> deployment type, valid values are 1200 GiB, 2400 GiB, and increments of 3600 GiB.</p> </li> </ul> <p> <b>FSx for ONTAP file systems</b> - The amount of storage capacity that you can configure depends on the value of the <code>HAPairs</code> property. The minimum value is calculated as 1,024 * <code>HAPairs</code> and the maximum is calculated as 524,288 * <code>HAPairs</code>. </p> <p> <b>FSx for OpenZFS file systems</b> - The amount of storage capacity that you can configure is from 64 GiB up to 524,288 GiB (512 TiB).</p> <p> <b>FSx for Windows File Server file systems</b> - The amount of storage capacity that you can configure depends on the value that you set for <code>StorageType</code> as follows:</p> <ul> <li> <p>For SSD storage, valid values are 32 GiB-65,536 GiB (64 TiB).</p> </li> <li> <p>For HDD storage, valid values are 2000 GiB-65,536 GiB (64 TiB).</p> </li> </ul>" }, "StorageType":{ "shape":"StorageType", - "documentation":"<p>Sets the storage type for the file system that you're creating. Valid values are <code>SSD</code> and <code>HDD</code>.</p> <ul> <li> <p>Set to <code>SSD</code> to use solid state drive storage. SSD is supported on all Windows, Lustre, ONTAP, and OpenZFS deployment types.</p> </li> <li> <p>Set to <code>HDD</code> to use hard disk drive storage. HDD is supported on <code>SINGLE_AZ_2</code> and <code>MULTI_AZ_1</code> Windows file system deployment types, and on <code>PERSISTENT_1</code> Lustre file system deployment types. </p> </li> </ul> <p>Default value is <code>SSD</code>. For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/WindowsGuide/optimize-fsx-costs.html#storage-type-options\"> Storage type options</a> in the <i>FSx for Windows File Server User Guide</i> and <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/what-is.html#storage-options\">Multiple storage options</a> in the <i>FSx for Lustre User Guide</i>. </p>" + "documentation":"<p>Sets the storage type for the file system that you're creating. Valid values are <code>SSD</code> and <code>HDD</code>.</p> <ul> <li> <p>Set to <code>SSD</code> to use solid state drive storage. SSD is supported on all Windows, Lustre, ONTAP, and OpenZFS deployment types.</p> </li> <li> <p>Set to <code>HDD</code> to use hard disk drive storage. HDD is supported on <code>SINGLE_AZ_2</code> and <code>MULTI_AZ_1</code> Windows file system deployment types, and on <code>PERSISTENT_1</code> Lustre file system deployment types.</p> </li> </ul> <p>Default value is <code>SSD</code>. For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/WindowsGuide/optimize-fsx-costs.html#storage-type-options\"> Storage type options</a> in the <i>FSx for Windows File Server User Guide</i> and <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/what-is.html#storage-options\">Multiple storage options</a> in the <i>FSx for Lustre User Guide</i>. </p>" }, "SubnetIds":{ "shape":"SubnetIds", @@ -1894,7 +1914,7 @@ "OntapConfiguration":{"shape":"CreateFileSystemOntapConfiguration"}, "FileSystemTypeVersion":{ "shape":"FileSystemTypeVersion", - "documentation":"<p>(Optional) For FSx for Lustre file systems, sets the Lustre version for the file system that you're creating. Valid values are <code>2.10</code>, <code>2.12</code>, and <code>2.15</code>:</p> <ul> <li> <p>2.10 is supported by the Scratch and Persistent_1 Lustre deployment types.</p> </li> <li> <p>2.12 and 2.15 are supported by all Lustre deployment types. <code>2.12</code> or <code>2.15</code> is required when setting FSx for Lustre <code>DeploymentType</code> to <code>PERSISTENT_2</code>.</p> </li> </ul> <p>Default value = <code>2.10</code>, except when <code>DeploymentType</code> is set to <code>PERSISTENT_2</code>, then the default is <code>2.12</code>.</p> <note> <p>If you set <code>FileSystemTypeVersion</code> to <code>2.10</code> for a <code>PERSISTENT_2</code> Lustre deployment type, the <code>CreateFileSystem</code> operation fails.</p> </note>" + "documentation":"<p>For FSx for Lustre file systems, sets the Lustre version for the file system that you're creating. Valid values are <code>2.10</code>, <code>2.12</code>, and <code>2.15</code>:</p> <ul> <li> <p> <code>2.10</code> is supported by the Scratch and Persistent_1 Lustre deployment types.</p> </li> <li> <p> <code>2.12</code> is supported by all Lustre deployment types, except for <code>PERSISTENT_2</code> with a metadata configuration mode.</p> </li> <li> <p> <code>2.15</code> is supported by all Lustre deployment types and is recommended for all new file systems.</p> </li> </ul> <p>Default value is <code>2.10</code>, except for the following deployments:</p> <ul> <li> <p>Default value is <code>2.12</code> when <code>DeploymentType</code> is set to <code>PERSISTENT_2</code> without a metadata configuration mode.</p> </li> <li> <p>Default value is <code>2.15</code> when <code>DeploymentType</code> is set to <code>PERSISTENT_2</code> with a metadata configuration mode.</p> </li> </ul>" }, "OpenZFSConfiguration":{ "shape":"CreateFileSystemOpenZFSConfiguration", @@ -1975,7 +1995,7 @@ }, "SecurityStyle":{ "shape":"SecurityStyle", - "documentation":"<p>Specifies the security style for the volume. If a volume's security style is not specified, it is automatically set to the root volume's security style. The security style determines the type of permissions that FSx for ONTAP uses to control data access. For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/volume-security-style\">Volume security style</a> in the <i>Amazon FSx for NetApp ONTAP User Guide</i>. Specify one of the following values:</p> <ul> <li> <p> <code>UNIX</code> if the file system is managed by a UNIX administrator, the majority of users are NFS clients, and an application accessing the data uses a UNIX user as the service account. </p> </li> <li> <p> <code>NTFS</code> if the file system is managed by a Windows administrator, the majority of users are SMB clients, and an application accessing the data uses a Windows user as the service account.</p> </li> <li> <p> <code>MIXED</code> This is an advanced setting. For more information, see the topic <a href=\"https://docs.netapp.com/us-en/ontap/nfs-admin/security-styles-their-effects-concept.html\">What the security styles and their effects are</a> in the NetApp Documentation Center.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/volume-security-style.html\">Volume security style</a> in the FSx for ONTAP User Guide.</p>" + "documentation":"<p>Specifies the security style for the volume. If a volume's security style is not specified, it is automatically set to the root volume's security style. The security style determines the type of permissions that FSx for ONTAP uses to control data access. Specify one of the following values:</p> <ul> <li> <p> <code>UNIX</code> if the file system is managed by a UNIX administrator, the majority of users are NFS clients, and an application accessing the data uses a UNIX user as the service account. </p> </li> <li> <p> <code>NTFS</code> if the file system is managed by a Windows administrator, the majority of users are SMB clients, and an application accessing the data uses a Windows user as the service account.</p> </li> <li> <p> <code>MIXED</code> This is an advanced setting. For more information, see the topic <a href=\"https://docs.netapp.com/us-en/ontap/nfs-admin/security-styles-their-effects-concept.html\">What the security styles and their effects are</a> in the NetApp Documentation Center.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/managing-volumes.html#volume-security-style\">Volume security style</a> in the FSx for ONTAP User Guide.</p>" }, "SizeInMegabytes":{ "shape":"VolumeCapacity", @@ -1994,7 +2014,7 @@ "TieringPolicy":{"shape":"TieringPolicy"}, "OntapVolumeType":{ "shape":"InputOntapVolumeType", - "documentation":"<p>Specifies the type of volume you are creating. Valid values are the following:</p> <ul> <li> <p> <code>RW</code> specifies a read/write volume. <code>RW</code> is the default.</p> </li> <li> <p> <code>DP</code> specifies a data-protection volume. A <code>DP</code> volume is read-only and can be used as the destination of a NetApp SnapMirror relationship.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/volume-types\">Volume types</a> in the Amazon FSx for NetApp ONTAP User Guide.</p>" + "documentation":"<p>Specifies the type of volume you are creating. Valid values are the following:</p> <ul> <li> <p> <code>RW</code> specifies a read/write volume. <code>RW</code> is the default.</p> </li> <li> <p> <code>DP</code> specifies a data-protection volume. A <code>DP</code> volume is read-only and can be used as the destination of a NetApp SnapMirror relationship.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/managing-volumes.html#volume-types\">Volume types</a> in the Amazon FSx for NetApp ONTAP User Guide.</p>" }, "SnapshotPolicy":{ "shape":"SnapshotPolicy", @@ -2010,7 +2030,7 @@ }, "VolumeStyle":{ "shape":"VolumeStyle", - "documentation":"<p>Use to specify the style of an ONTAP volume. FSx for ONTAP offers two styles of volumes that you can use for different purposes, FlexVol and FlexGroup volumes. For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/volume-styles.html\">Volume styles</a> in the Amazon FSx for NetApp ONTAP User Guide.</p>" + "documentation":"<p>Use to specify the style of an ONTAP volume. FSx for ONTAP offers two styles of volumes that you can use for different purposes, FlexVol and FlexGroup volumes. For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/managing-volumes.html#volume-styles\">Volume styles</a> in the Amazon FSx for NetApp ONTAP User Guide.</p>" }, "AggregateConfiguration":{ "shape":"CreateAggregateConfiguration", @@ -2174,7 +2194,7 @@ "Tags":{"shape":"Tags"}, "RootVolumeSecurityStyle":{ "shape":"StorageVirtualMachineRootVolumeSecurityStyle", - "documentation":"<p>The security style of the root volume of the SVM. Specify one of the following values:</p> <ul> <li> <p> <code>UNIX</code> if the file system is managed by a UNIX administrator, the majority of users are NFS clients, and an application accessing the data uses a UNIX user as the service account.</p> </li> <li> <p> <code>NTFS</code> if the file system is managed by a Microsoft Windows administrator, the majority of users are SMB clients, and an application accessing the data uses a Microsoft Windows user as the service account.</p> </li> <li> <p> <code>MIXED</code> This is an advanced setting. For more information, see <a href=\"fsx/latest/ONTAPGuide/volume-security-style.html\">Volume security style</a> in the Amazon FSx for NetApp ONTAP User Guide.</p> </li> </ul> <p/>" + "documentation":"<p>The security style of the root volume of the SVM. Specify one of the following values:</p> <ul> <li> <p> <code>UNIX</code> if the file system is managed by a UNIX administrator, the majority of users are NFS clients, and an application accessing the data uses a UNIX user as the service account.</p> </li> <li> <p> <code>NTFS</code> if the file system is managed by a Microsoft Windows administrator, the majority of users are SMB clients, and an application accessing the data uses a Microsoft Windows user as the service account.</p> </li> <li> <p> <code>MIXED</code> This is an advanced setting. For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/ONTAPGuide/volume-security-style.html\">Volume security style</a> in the Amazon FSx for NetApp ONTAP User Guide.</p> </li> </ul> <p/>" } } }, @@ -3487,7 +3507,7 @@ }, "DataRepositoryPath":{ "shape":"ArchivePath", - "documentation":"<p>The path to the S3 or NFS data repository that links to the cache. You must provide one of the following paths:</p> <ul> <li> <p>The path can be an NFS data repository that links to the cache. The path can be in one of two formats:</p> <ul> <li> <p>If you are not using the <code>DataRepositorySubdirectories</code> parameter, the path is to an NFS Export directory (or one of its subdirectories) in the format <code>nsf://nfs-domain-name/exportpath</code>. You can therefore link a single NFS Export to a single data repository association.</p> </li> <li> <p>If you are using the <code>DataRepositorySubdirectories</code> parameter, the path is the domain name of the NFS file system in the format <code>nfs://filer-domain-name</code>, which indicates the root of the subdirectories specified with the <code>DataRepositorySubdirectories</code> parameter.</p> </li> </ul> </li> <li> <p>The path can be an S3 bucket or prefix in the format <code>s3://myBucket/myPrefix/</code>.</p> </li> </ul>" + "documentation":"<p>The path to the S3 or NFS data repository that links to the cache. You must provide one of the following paths:</p> <ul> <li> <p>The path can be an NFS data repository that links to the cache. The path can be in one of two formats:</p> <ul> <li> <p>If you are not using the <code>DataRepositorySubdirectories</code> parameter, the path is to an NFS Export directory (or one of its subdirectories) in the format <code>nfs://nfs-domain-name/exportpath</code>. You can therefore link a single NFS Export to a single data repository association.</p> </li> <li> <p>If you are using the <code>DataRepositorySubdirectories</code> parameter, the path is the domain name of the NFS file system in the format <code>nfs://filer-domain-name</code>, which indicates the root of the subdirectories specified with the <code>DataRepositorySubdirectories</code> parameter.</p> </li> </ul> </li> <li> <p>The path can be an S3 bucket or prefix in the format <code>s3://myBucket/myPrefix/</code>.</p> </li> </ul>" }, "DataRepositorySubdirectories":{ "shape":"SubDirectoriesPaths", @@ -3756,6 +3776,21 @@ "MISCONFIGURED_UNAVAILABLE" ] }, + "FileSystemLustreMetadataConfiguration":{ + "type":"structure", + "required":["Mode"], + "members":{ + "Iops":{ + "shape":"MetadataIops", + "documentation":"<p>The number of Metadata IOPS provisioned for the file system. Valid values are <code>1500</code>, <code>3000</code>, <code>6000</code>, <code>12000</code>, and multiples of <code>12000</code> up to a maximum of <code>192000</code>.</p>" + }, + "Mode":{ + "shape":"MetadataConfigurationMode", + "documentation":"<p>The metadata configuration mode for provisioning Metadata IOPS for the file system.</p> <ul> <li> <p>In AUTOMATIC mode, FSx for Lustre automatically provisions and scales the number of Metadata IOPS on your file system based on your file system storage capacity.</p> </li> <li> <p>In USER_PROVISIONED mode, you can choose to specify the number of Metadata IOPS to provision for your file system.</p> </li> </ul>" + } + }, + "documentation":"<p>The Lustre metadata performance configuration of an Amazon FSx for Lustre file system using a <code>PERSISTENT_2</code> deployment type. The configuration enables the file system to support increasing metadata performance.</p>" + }, "FileSystemMaintenanceOperation":{ "type":"string", "documentation":"<p>An enumeration specifying the currently ongoing maintenance operation.</p>", @@ -4133,6 +4168,10 @@ "RootSquashConfiguration":{ "shape":"LustreRootSquashConfiguration", "documentation":"<p>The Lustre root squash configuration for an Amazon FSx for Lustre file system. When enabled, root squash restricts root-level access from clients that try to access your file system as a root user.</p>" + }, + "MetadataConfiguration":{ + "shape":"FileSystemLustreMetadataConfiguration", + "documentation":"<p>The Lustre metadata performance configuration for an Amazon FSx for Lustre file system using a <code>PERSISTENT_2</code> deployment type.</p>" } }, "documentation":"<p>The configuration for the Amazon FSx for Lustre file system.</p>" @@ -4221,6 +4260,18 @@ "max":100000, "min":8 }, + "MetadataConfigurationMode":{ + "type":"string", + "enum":[ + "AUTOMATIC", + "USER_PROVISIONED" + ] + }, + "MetadataIops":{ + "type":"integer", + "max":192000, + "min":1500 + }, "MetadataStorageCapacity":{ "type":"integer", "max":2147483647, @@ -5054,30 +5105,30 @@ "members":{ "UserName":{ "shape":"DirectoryUserName", - "documentation":"<p>Specifies the updated user name for the service account on your self-managed AD domain. Amazon FSx uses this account to join to your self-managed AD domain.</p> <p>This account must have the permissions required to join computers to the domain in the organizational unit provided in <code>OrganizationalUnitDistinguishedName</code>.</p>" + "documentation":"<p>Specifies the updated user name for the service account on your self-managed Active Directory domain. Amazon FSx uses this account to join to your self-managed Active Directory domain.</p> <p>This account must have the permissions required to join computers to the domain in the organizational unit provided in <code>OrganizationalUnitDistinguishedName</code>.</p>" }, "Password":{ "shape":"DirectoryPassword", - "documentation":"<p>Specifies the updated password for the service account on your self-managed AD domain. Amazon FSx uses this account to join to your self-managed AD domain.</p>" + "documentation":"<p>Specifies the updated password for the service account on your self-managed Active Directory domain. Amazon FSx uses this account to join to your self-managed Active Directory domain.</p>" }, "DnsIps":{ "shape":"DnsIps", - "documentation":"<p>A list of up to three DNS server or domain controller IP addresses in your self-managed AD domain.</p>" + "documentation":"<p>A list of up to three DNS server or domain controller IP addresses in your self-managed Active Directory domain.</p>" }, "DomainName":{ "shape":"ActiveDirectoryFullyQualifiedName", - "documentation":"<p>Specifies an updated fully qualified domain name of your self-managed AD configuration.</p>" + "documentation":"<p>Specifies an updated fully qualified domain name of your self-managed Active Directory configuration.</p>" }, "OrganizationalUnitDistinguishedName":{ "shape":"OrganizationalUnitDistinguishedName", - "documentation":"<p>Specifies an updated fully qualified distinguished name of the organization unit within your self-managed AD.</p>" + "documentation":"<p>Specifies an updated fully qualified distinguished name of the organization unit within your self-managed Active Directory.</p>" }, "FileSystemAdministratorsGroup":{ "shape":"FileSystemAdministratorsGroupName", - "documentation":"<p>Specifies the updated name of the self-managed AD domain group whose members are granted administrative privileges for the Amazon FSx resource.</p>" + "documentation":"<p>For FSx for ONTAP file systems only - Specifies the updated name of the self-managed Active Directory domain group whose members are granted administrative privileges for the Amazon FSx resource.</p>" } }, - "documentation":"<p>Specifies changes you are making to the self-managed Microsoft Active Directory (AD) configuration to which an FSx for Windows File Server file system or an FSx for ONTAP SVM is joined.</p>" + "documentation":"<p>Specifies changes you are making to the self-managed Microsoft Active Directory configuration to which an FSx for Windows File Server file system or an FSx for ONTAP SVM is joined.</p>" }, "ServiceLimit":{ "type":"string", @@ -5793,10 +5844,28 @@ "PerUnitStorageThroughput":{ "shape":"PerUnitStorageThroughput", "documentation":"<p>The throughput of an Amazon FSx for Lustre Persistent SSD-based file system, measured in megabytes per second per tebibyte (MB/s/TiB). You can increase or decrease your file system's throughput. Valid values depend on the deployment type of the file system, as follows:</p> <ul> <li> <p>For <code>PERSISTENT_1</code> SSD-based deployment types, valid values are 50, 100, and 200 MB/s/TiB.</p> </li> <li> <p>For <code>PERSISTENT_2</code> SSD-based deployment types, valid values are 125, 250, 500, and 1000 MB/s/TiB.</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/managing-throughput-capacity.html\"> Managing throughput capacity</a>.</p>" + }, + "MetadataConfiguration":{ + "shape":"UpdateFileSystemLustreMetadataConfiguration", + "documentation":"<p>The Lustre metadata performance configuration for an Amazon FSx for Lustre file system using a <code>PERSISTENT_2</code> deployment type. When this configuration is enabled, the file system supports increasing metadata performance.</p>" } }, "documentation":"<p>The configuration object for Amazon FSx for Lustre file systems used in the <code>UpdateFileSystem</code> operation.</p>" }, + "UpdateFileSystemLustreMetadataConfiguration":{ + "type":"structure", + "members":{ + "Iops":{ + "shape":"MetadataIops", + "documentation":"<p>(USER_PROVISIONED mode only) Specifies the number of Metadata IOPS to provision for your file system. Valid values are <code>1500</code>, <code>3000</code>, <code>6000</code>, <code>12000</code>, and multiples of <code>12000</code> up to a maximum of <code>192000</code>.</p> <p>The value you provide must be greater than or equal to the current number of Metadata IOPS provisioned for the file system.</p>" + }, + "Mode":{ + "shape":"MetadataConfigurationMode", + "documentation":"<p>The metadata configuration mode for provisioning Metadata IOPS for an FSx for Lustre file system using a <code>PERSISTENT_2</code> deployment type.</p> <ul> <li> <p>To increase the Metadata IOPS or to switch from AUTOMATIC mode, specify <code>USER_PROVISIONED</code> as the value for this parameter. Then use the Iops parameter to provide a Metadata IOPS value that is greater than or equal to the current number of Metadata IOPS provisioned for the file system.</p> </li> <li> <p>To switch from USER_PROVISIONED mode, specify <code>AUTOMATIC</code> as the value for this parameter, but do not input a value for Iops.</p> <note> <p>If you request to switch from USER_PROVISIONED to AUTOMATIC mode and the current Metadata IOPS value is greater than the automated default, FSx for Lustre rejects the request because downscaling Metadata IOPS is not supported.</p> </note> </li> </ul>" + } + }, + "documentation":"<p>The Lustre metadata performance configuration update for an Amazon FSx for Lustre file system using a <code>PERSISTENT_2</code> deployment type. You can request an increase in your file system's Metadata IOPS and/or switch your file system's metadata configuration mode. For more information, see <a href=\"https://docs.aws.amazon.com/fsx/latest/LustreGuide/managing-metadata-performance.html\">Managing metadata performance</a> in the <i>Amazon FSx for Lustre User Guide</i>.</p>" + }, "UpdateFileSystemOntapConfiguration":{ "type":"structure", "members":{ diff --git a/services/gamelift/pom.xml b/services/gamelift/pom.xml index 5a94ac371f40..20b9da749fc9 100644 --- a/services/gamelift/pom.xml +++ b/services/gamelift/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>gamelift</artifactId> <name>AWS Java SDK :: Services :: AWS GameLift</name> diff --git a/services/glacier/pom.xml b/services/glacier/pom.xml index 6998afa7c5cc..0a6ea741ca79 100644 --- a/services/glacier/pom.xml +++ b/services/glacier/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>glacier</artifactId> <name>AWS Java SDK :: Services :: Amazon Glacier</name> diff --git a/services/globalaccelerator/pom.xml b/services/globalaccelerator/pom.xml index 095cf209c477..9af2a19a928b 100644 --- a/services/globalaccelerator/pom.xml +++ b/services/globalaccelerator/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>globalaccelerator</artifactId> <name>AWS Java SDK :: Services :: Global Accelerator</name> diff --git a/services/globalaccelerator/src/main/resources/codegen-resources/service-2.json b/services/globalaccelerator/src/main/resources/codegen-resources/service-2.json index 9870e6db545a..0f8f1811cc25 100644 --- a/services/globalaccelerator/src/main/resources/codegen-resources/service-2.json +++ b/services/globalaccelerator/src/main/resources/codegen-resources/service-2.json @@ -5,12 +5,14 @@ "endpointPrefix":"globalaccelerator", "jsonVersion":"1.1", "protocol":"json", + "protocols":["json"], "serviceFullName":"AWS Global Accelerator", "serviceId":"Global Accelerator", "signatureVersion":"v4", "signingName":"globalaccelerator", "targetPrefix":"GlobalAccelerator_V20180706", - "uid":"globalaccelerator-2018-08-08" + "uid":"globalaccelerator-2018-08-08", + "auth":["aws.auth#sigv4"] }, "operations":{ "AddCustomRoutingEndpoints":{ @@ -3264,6 +3266,10 @@ "shape":"IpAddressType", "documentation":"<p>The IP address type that an accelerator supports. For a standard accelerator, the value can be IPV4 or DUAL_STACK.</p>" }, + "IpAddresses":{ + "shape":"IpAddresses", + "documentation":"<p>The IP addresses for an accelerator.</p>" + }, "Enabled":{ "shape":"GenericBoolean", "documentation":"<p>Indicates whether an accelerator is enabled. The value is true or false. The default value is true. </p> <p>If the value is set to true, the accelerator cannot be deleted. If set to false, the accelerator can be deleted.</p>" @@ -3365,6 +3371,10 @@ "shape":"IpAddressType", "documentation":"<p>The IP address type that an accelerator supports. For a custom routing accelerator, the value must be IPV4.</p>" }, + "IpAddresses":{ + "shape":"IpAddresses", + "documentation":"<p>The IP addresses for an accelerator.</p>" + }, "Enabled":{ "shape":"GenericBoolean", "documentation":"<p>Indicates whether an accelerator is enabled. The value is true or false. The default value is true. </p> <p>If the value is set to true, the accelerator cannot be deleted. If set to false, the accelerator can be deleted.</p>" diff --git a/services/glue/pom.xml b/services/glue/pom.xml index 1c5fa574928a..694a5f5f164f 100644 --- a/services/glue/pom.xml +++ b/services/glue/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>glue</artifactId> diff --git a/services/glue/src/main/resources/codegen-resources/service-2.json b/services/glue/src/main/resources/codegen-resources/service-2.json index 8b5d36378ad2..3d9c0c27f87f 100644 --- a/services/glue/src/main/resources/codegen-resources/service-2.json +++ b/services/glue/src/main/resources/codegen-resources/service-2.json @@ -10,7 +10,8 @@ "serviceId":"Glue", "signatureVersion":"v4", "targetPrefix":"AWSGlue", - "uid":"glue-2017-03-31" + "uid":"glue-2017-03-31", + "auth":["aws.auth#sigv4"] }, "operations":{ "BatchCreatePartition":{ @@ -3540,6 +3541,11 @@ } }, "shapes":{ + "AWSManagedClientApplicationReference":{ + "type":"string", + "max":2048, + "pattern":"\\S+" + }, "AccessDeniedException":{ "type":"structure", "members":{ @@ -3958,6 +3964,70 @@ "min":1, "pattern":"[\\u0020-\\uD7FF\\uE000-\\uFFFD\\uD800\\uDC00-\\uDBFF\\uDFFF\\t]*" }, + "AuthenticationConfiguration":{ + "type":"structure", + "members":{ + "AuthenticationType":{ + "shape":"AuthenticationType", + "documentation":"<p>A structure containing the authentication configuration.</p>" + }, + "SecretArn":{ + "shape":"SecretArn", + "documentation":"<p>The secret manager ARN to store credentials.</p>" + }, + "OAuth2Properties":{ + "shape":"OAuth2Properties", + "documentation":"<p>The properties for OAuth2 authentication.</p>" + } + }, + "documentation":"<p>A structure containing the authentication configuration.</p>" + }, + "AuthenticationConfigurationInput":{ + "type":"structure", + "members":{ + "AuthenticationType":{ + "shape":"AuthenticationType", + "documentation":"<p>A structure containing the authentication configuration in the CreateConnection request.</p>" + }, + "SecretArn":{ + "shape":"SecretArn", + "documentation":"<p>The secret manager ARN to store credentials in the CreateConnection request.</p>" + }, + "OAuth2Properties":{ + "shape":"OAuth2PropertiesInput", + "documentation":"<p>The properties for OAuth2 authentication in the CreateConnection request.</p>" + } + }, + "documentation":"<p>A structure containing the authentication configuration in the CreateConnection request.</p>" + }, + "AuthenticationType":{ + "type":"string", + "enum":[ + "BASIC", + "OAUTH2", + "CUSTOM" + ] + }, + "AuthorizationCode":{ + "type":"string", + "max":4096, + "min":1, + "pattern":"\\S+" + }, + "AuthorizationCodeProperties":{ + "type":"structure", + "members":{ + "AuthorizationCode":{ + "shape":"AuthorizationCode", + "documentation":"<p>An authorization code to be used in the third leg of the <code>AUTHORIZATION_CODE</code> grant workflow. This is a single-use code which becomes invalid once exchanged for an access token, thus it is acceptable to have this value as a request parameter.</p>" + }, + "RedirectUri":{ + "shape":"RedirectUri", + "documentation":"<p>The redirect URI where the user gets redirected to by authorization server when issuing an authorization code. The URI is subsequently used when the authorization code is exchanged for an access token.</p>" + } + }, + "documentation":"<p>The set of properties required for the the OAuth2 <code>AUTHORIZATION_CODE</code> grant type workflow.</p>" + }, "BackfillError":{ "type":"structure", "members":{ @@ -6279,19 +6349,35 @@ }, "PhysicalConnectionRequirements":{ "shape":"PhysicalConnectionRequirements", - "documentation":"<p>A map of physical connection requirements, such as virtual private cloud (VPC) and <code>SecurityGroup</code>, that are needed to make this connection successfully.</p>" + "documentation":"<p>The physical connection requirements, such as virtual private cloud (VPC) and <code>SecurityGroup</code>, that are needed to make this connection successfully.</p>" }, "CreationTime":{ "shape":"Timestamp", - "documentation":"<p>The time that this connection definition was created.</p>" + "documentation":"<p>The timestamp of the time that this connection definition was created.</p>" }, "LastUpdatedTime":{ "shape":"Timestamp", - "documentation":"<p>The last time that this connection definition was updated.</p>" + "documentation":"<p>The timestamp of the last time the connection definition was updated.</p>" }, "LastUpdatedBy":{ "shape":"NameString", "documentation":"<p>The user, group, or role that last updated this connection definition.</p>" + }, + "Status":{ + "shape":"ConnectionStatus", + "documentation":"<p>The status of the connection. Can be one of: <code>READY</code>, <code>IN_PROGRESS</code>, or <code>FAILED</code>.</p>" + }, + "StatusReason":{ + "shape":"LongValueString", + "documentation":"<p>The reason for the connection status.</p>" + }, + "LastConnectionValidationTime":{ + "shape":"Timestamp", + "documentation":"<p>A timestamp of the time this connection was last validated.</p>" + }, + "AuthenticationConfiguration":{ + "shape":"AuthenticationConfiguration", + "documentation":"<p>The authentication properties of the connection.</p>" } }, "documentation":"<p>Defines a connection to a data source.</p>" @@ -6306,7 +6392,7 @@ "members":{ "Name":{ "shape":"NameString", - "documentation":"<p>The name of the connection. Connection will not function as expected without a name.</p>" + "documentation":"<p>The name of the connection.</p>" }, "Description":{ "shape":"DescriptionString", @@ -6314,7 +6400,7 @@ }, "ConnectionType":{ "shape":"ConnectionType", - "documentation":"<p>The type of the connection. Currently, these types are supported:</p> <ul> <li> <p> <code>JDBC</code> - Designates a connection to a database through Java Database Connectivity (JDBC).</p> <p> <code>JDBC</code> Connections use the following ConnectionParameters.</p> <ul> <li> <p>Required: All of (<code>HOST</code>, <code>PORT</code>, <code>JDBC_ENGINE</code>) or <code>JDBC_CONNECTION_URL</code>.</p> </li> <li> <p>Required: All of (<code>USERNAME</code>, <code>PASSWORD</code>) or <code>SECRET_ID</code>.</p> </li> <li> <p>Optional: <code>JDBC_ENFORCE_SSL</code>, <code>CUSTOM_JDBC_CERT</code>, <code>CUSTOM_JDBC_CERT_STRING</code>, <code>SKIP_CUSTOM_JDBC_CERT_VALIDATION</code>. These parameters are used to configure SSL with JDBC.</p> </li> </ul> </li> <li> <p> <code>KAFKA</code> - Designates a connection to an Apache Kafka streaming platform.</p> <p> <code>KAFKA</code> Connections use the following ConnectionParameters.</p> <ul> <li> <p>Required: <code>KAFKA_BOOTSTRAP_SERVERS</code>.</p> </li> <li> <p>Optional: <code>KAFKA_SSL_ENABLED</code>, <code>KAFKA_CUSTOM_CERT</code>, <code>KAFKA_SKIP_CUSTOM_CERT_VALIDATION</code>. These parameters are used to configure SSL with <code>KAFKA</code>.</p> </li> <li> <p>Optional: <code>KAFKA_CLIENT_KEYSTORE</code>, <code>KAFKA_CLIENT_KEYSTORE_PASSWORD</code>, <code>KAFKA_CLIENT_KEY_PASSWORD</code>, <code>ENCRYPTED_KAFKA_CLIENT_KEYSTORE_PASSWORD</code>, <code>ENCRYPTED_KAFKA_CLIENT_KEY_PASSWORD</code>. These parameters are used to configure TLS client configuration with SSL in <code>KAFKA</code>.</p> </li> <li> <p>Optional: <code>KAFKA_SASL_MECHANISM</code>. Can be specified as <code>SCRAM-SHA-512</code>, <code>GSSAPI</code>, or <code>AWS_MSK_IAM</code>.</p> </li> <li> <p>Optional: <code>KAFKA_SASL_SCRAM_USERNAME</code>, <code>KAFKA_SASL_SCRAM_PASSWORD</code>, <code>ENCRYPTED_KAFKA_SASL_SCRAM_PASSWORD</code>. These parameters are used to configure SASL/SCRAM-SHA-512 authentication with <code>KAFKA</code>.</p> </li> <li> <p>Optional: <code>KAFKA_SASL_GSSAPI_KEYTAB</code>, <code>KAFKA_SASL_GSSAPI_KRB5_CONF</code>, <code>KAFKA_SASL_GSSAPI_SERVICE</code>, <code>KAFKA_SASL_GSSAPI_PRINCIPAL</code>. These parameters are used to configure SASL/GSSAPI authentication with <code>KAFKA</code>.</p> </li> </ul> </li> <li> <p> <code>MONGODB</code> - Designates a connection to a MongoDB document database.</p> <p> <code>MONGODB</code> Connections use the following ConnectionParameters.</p> <ul> <li> <p>Required: <code>CONNECTION_URL</code>.</p> </li> <li> <p>Required: All of (<code>USERNAME</code>, <code>PASSWORD</code>) or <code>SECRET_ID</code>.</p> </li> </ul> </li> <li> <p> <code>NETWORK</code> - Designates a network connection to a data source within an Amazon Virtual Private Cloud environment (Amazon VPC).</p> <p> <code>NETWORK</code> Connections do not require ConnectionParameters. Instead, provide a PhysicalConnectionRequirements.</p> </li> <li> <p> <code>MARKETPLACE</code> - Uses configuration settings contained in a connector purchased from Amazon Web Services Marketplace to read from and write to data stores that are not natively supported by Glue.</p> <p> <code>MARKETPLACE</code> Connections use the following ConnectionParameters.</p> <ul> <li> <p>Required: <code>CONNECTOR_TYPE</code>, <code>CONNECTOR_URL</code>, <code>CONNECTOR_CLASS_NAME</code>, <code>CONNECTION_URL</code>.</p> </li> <li> <p>Required for <code>JDBC</code> <code>CONNECTOR_TYPE</code> connections: All of (<code>USERNAME</code>, <code>PASSWORD</code>) or <code>SECRET_ID</code>.</p> </li> </ul> </li> <li> <p> <code>CUSTOM</code> - Uses configuration settings contained in a custom connector to read from and write to data stores that are not natively supported by Glue.</p> </li> </ul> <p> <code>SFTP</code> is not supported.</p> <p>For more information about how optional ConnectionProperties are used to configure features in Glue, consult <a href=\"https://docs.aws.amazon.com/glue/latest/dg/connection-defining.html\">Glue connection properties</a>.</p> <p>For more information about how optional ConnectionProperties are used to configure features in Glue Studio, consult <a href=\"https://docs.aws.amazon.com/glue/latest/ug/connectors-chapter.html\">Using connectors and connections</a>.</p>" + "documentation":"<p>The type of the connection. Currently, these types are supported:</p> <ul> <li> <p> <code>JDBC</code> - Designates a connection to a database through Java Database Connectivity (JDBC).</p> <p> <code>JDBC</code> Connections use the following ConnectionParameters.</p> <ul> <li> <p>Required: All of (<code>HOST</code>, <code>PORT</code>, <code>JDBC_ENGINE</code>) or <code>JDBC_CONNECTION_URL</code>.</p> </li> <li> <p>Required: All of (<code>USERNAME</code>, <code>PASSWORD</code>) or <code>SECRET_ID</code>.</p> </li> <li> <p>Optional: <code>JDBC_ENFORCE_SSL</code>, <code>CUSTOM_JDBC_CERT</code>, <code>CUSTOM_JDBC_CERT_STRING</code>, <code>SKIP_CUSTOM_JDBC_CERT_VALIDATION</code>. These parameters are used to configure SSL with JDBC.</p> </li> </ul> </li> <li> <p> <code>KAFKA</code> - Designates a connection to an Apache Kafka streaming platform.</p> <p> <code>KAFKA</code> Connections use the following ConnectionParameters.</p> <ul> <li> <p>Required: <code>KAFKA_BOOTSTRAP_SERVERS</code>.</p> </li> <li> <p>Optional: <code>KAFKA_SSL_ENABLED</code>, <code>KAFKA_CUSTOM_CERT</code>, <code>KAFKA_SKIP_CUSTOM_CERT_VALIDATION</code>. These parameters are used to configure SSL with <code>KAFKA</code>.</p> </li> <li> <p>Optional: <code>KAFKA_CLIENT_KEYSTORE</code>, <code>KAFKA_CLIENT_KEYSTORE_PASSWORD</code>, <code>KAFKA_CLIENT_KEY_PASSWORD</code>, <code>ENCRYPTED_KAFKA_CLIENT_KEYSTORE_PASSWORD</code>, <code>ENCRYPTED_KAFKA_CLIENT_KEY_PASSWORD</code>. These parameters are used to configure TLS client configuration with SSL in <code>KAFKA</code>.</p> </li> <li> <p>Optional: <code>KAFKA_SASL_MECHANISM</code>. Can be specified as <code>SCRAM-SHA-512</code>, <code>GSSAPI</code>, or <code>AWS_MSK_IAM</code>.</p> </li> <li> <p>Optional: <code>KAFKA_SASL_SCRAM_USERNAME</code>, <code>KAFKA_SASL_SCRAM_PASSWORD</code>, <code>ENCRYPTED_KAFKA_SASL_SCRAM_PASSWORD</code>. These parameters are used to configure SASL/SCRAM-SHA-512 authentication with <code>KAFKA</code>.</p> </li> <li> <p>Optional: <code>KAFKA_SASL_GSSAPI_KEYTAB</code>, <code>KAFKA_SASL_GSSAPI_KRB5_CONF</code>, <code>KAFKA_SASL_GSSAPI_SERVICE</code>, <code>KAFKA_SASL_GSSAPI_PRINCIPAL</code>. These parameters are used to configure SASL/GSSAPI authentication with <code>KAFKA</code>.</p> </li> </ul> </li> <li> <p> <code>MONGODB</code> - Designates a connection to a MongoDB document database.</p> <p> <code>MONGODB</code> Connections use the following ConnectionParameters.</p> <ul> <li> <p>Required: <code>CONNECTION_URL</code>.</p> </li> <li> <p>Required: All of (<code>USERNAME</code>, <code>PASSWORD</code>) or <code>SECRET_ID</code>.</p> </li> </ul> </li> <li> <p> <code>SALESFORCE</code> - Designates a connection to Salesforce using OAuth authencation.</p> <ul> <li> <p>Requires the <code>AuthenticationConfiguration</code> member to be configured.</p> </li> </ul> </li> <li> <p> <code>NETWORK</code> - Designates a network connection to a data source within an Amazon Virtual Private Cloud environment (Amazon VPC).</p> <p> <code>NETWORK</code> Connections do not require ConnectionParameters. Instead, provide a PhysicalConnectionRequirements.</p> </li> <li> <p> <code>MARKETPLACE</code> - Uses configuration settings contained in a connector purchased from Amazon Web Services Marketplace to read from and write to data stores that are not natively supported by Glue.</p> <p> <code>MARKETPLACE</code> Connections use the following ConnectionParameters.</p> <ul> <li> <p>Required: <code>CONNECTOR_TYPE</code>, <code>CONNECTOR_URL</code>, <code>CONNECTOR_CLASS_NAME</code>, <code>CONNECTION_URL</code>.</p> </li> <li> <p>Required for <code>JDBC</code> <code>CONNECTOR_TYPE</code> connections: All of (<code>USERNAME</code>, <code>PASSWORD</code>) or <code>SECRET_ID</code>.</p> </li> </ul> </li> <li> <p> <code>CUSTOM</code> - Uses configuration settings contained in a custom connector to read from and write to data stores that are not natively supported by Glue.</p> </li> </ul> <p> <code>SFTP</code> is not supported.</p> <p>For more information about how optional ConnectionProperties are used to configure features in Glue, consult <a href=\"https://docs.aws.amazon.com/glue/latest/dg/connection-defining.html\">Glue connection properties</a>.</p> <p>For more information about how optional ConnectionProperties are used to configure features in Glue Studio, consult <a href=\"https://docs.aws.amazon.com/glue/latest/ug/connectors-chapter.html\">Using connectors and connections</a>.</p>" }, "MatchCriteria":{ "shape":"MatchCriteria", @@ -6326,7 +6412,15 @@ }, "PhysicalConnectionRequirements":{ "shape":"PhysicalConnectionRequirements", - "documentation":"<p>A map of physical connection requirements, such as virtual private cloud (VPC) and <code>SecurityGroup</code>, that are needed to successfully make this connection.</p>" + "documentation":"<p>The physical connection requirements, such as virtual private cloud (VPC) and <code>SecurityGroup</code>, that are needed to successfully make this connection.</p>" + }, + "AuthenticationConfiguration":{ + "shape":"AuthenticationConfigurationInput", + "documentation":"<p>The authentication properties of the connection. Used for a Salesforce connection.</p>" + }, + "ValidateCredentials":{ + "shape":"Boolean", + "documentation":"<p>A flag to validate the credentials during create connection. Used for a Salesforce connection. Default is true. </p>" } }, "documentation":"<p>A structure that is used to specify a connection to create or update.</p>" @@ -6402,7 +6496,16 @@ "KAFKA_SASL_GSSAPI_KEYTAB", "KAFKA_SASL_GSSAPI_KRB5_CONF", "KAFKA_SASL_GSSAPI_SERVICE", - "KAFKA_SASL_GSSAPI_PRINCIPAL" + "KAFKA_SASL_GSSAPI_PRINCIPAL", + "ROLE_ARN" + ] + }, + "ConnectionStatus":{ + "type":"string", + "enum":[ + "READY", + "IN_PROGRESS", + "FAILED" ] }, "ConnectionType":{ @@ -6414,7 +6517,8 @@ "KAFKA", "NETWORK", "MARKETPLACE", - "CUSTOM" + "CUSTOM", + "SALESFORCE" ] }, "ConnectionsList":{ @@ -6950,6 +7054,10 @@ "CreateConnectionResponse":{ "type":"structure", "members":{ + "CreateConnectionStatus":{ + "shape":"ConnectionStatus", + "documentation":"<p>The status of the connection creation request. The request can take some time for certain authentication types, for example when creating an OAuth connection with token exchange over VPC.</p>" + } } }, "CreateCrawlerRequest":{ @@ -7410,7 +7518,7 @@ }, "Timeout":{ "shape":"Timeout", - "documentation":"<p>The job timeout in minutes. This is the maximum time that a job run can consume resources before it is terminated and enters <code>TIMEOUT</code> status. The default is 2,880 minutes (48 hours).</p>" + "documentation":"<p>The job timeout in minutes. This is the maximum time that a job run can consume resources before it is terminated and enters <code>TIMEOUT</code> status. The default is 2,880 minutes (48 hours) for batch jobs.</p> <p>Streaming jobs must have timeout values less than 7 days or 10080 minutes. When the value is left blank, the job will be restarted after 7 days based if you have not setup a maintenance window. If you have setup maintenance window, it will be restarted during the maintenance window after 7 days.</p>" }, "MaxCapacity":{ "shape":"NullableDouble", @@ -10482,10 +10590,15 @@ "FederationSourceErrorCode":{ "type":"string", "enum":[ + "AccessDeniedException", + "EntityNotFoundException", + "InvalidCredentialsException", + "InvalidInputException", "InvalidResponseException", "OperationTimeoutException", "OperationNotSupportedException", "InternalServiceException", + "PartialFailureException", "ThrottlingException" ] }, @@ -14046,7 +14159,7 @@ }, "Timeout":{ "shape":"Timeout", - "documentation":"<p>The job timeout in minutes. This is the maximum time that a job run can consume resources before it is terminated and enters <code>TIMEOUT</code> status. The default is 2,880 minutes (48 hours).</p>" + "documentation":"<p>The job timeout in minutes. This is the maximum time that a job run can consume resources before it is terminated and enters <code>TIMEOUT</code> status. The default is 2,880 minutes (48 hours) for batch jobs.</p> <p>Streaming jobs must have timeout values less than 7 days or 10080 minutes. When the value is left blank, the job will be restarted after 7 days based if you have not setup a maintenance window. If you have setup maintenance window, it will be restarted during the maintenance window after 7 days.</p>" }, "MaxCapacity":{ "shape":"NullableDouble", @@ -14262,7 +14375,7 @@ }, "Timeout":{ "shape":"Timeout", - "documentation":"<p>The <code>JobRun</code> timeout in minutes. This is the maximum time that a job run can consume resources before it is terminated and enters <code>TIMEOUT</code> status. This value overrides the timeout value set in the parent job.</p> <p>The maximum value for timeout for batch jobs is 7 days or 10080 minutes. The default is 2880 minutes (48 hours) for batch jobs.</p> <p>Any existing Glue jobs that have a greater timeout value are defaulted to 7 days. For instance you have specified a timeout of 20 days for a batch job, it will be stopped on the 7th day.</p> <p>Streaming jobs must have timeout values less than 7 days or 10080 minutes. When the value is left blank, the job will be restarted after 7 days based if you have not setup a maintenance window. If you have setup maintenance window, it will be restarted during the maintenance window after 7 days.</p>" + "documentation":"<p>The <code>JobRun</code> timeout in minutes. This is the maximum time that a job run can consume resources before it is terminated and enters <code>TIMEOUT</code> status. This value overrides the timeout value set in the parent job.</p> <p>Streaming jobs must have timeout values less than 7 days or 10080 minutes. When the value is left blank, the job will be restarted after 7 days based if you have not setup a maintenance window. If you have setup maintenance window, it will be restarted during the maintenance window after 7 days.</p>" }, "MaxCapacity":{ "shape":"NullableDouble", @@ -14377,7 +14490,7 @@ }, "Timeout":{ "shape":"Timeout", - "documentation":"<p>The job timeout in minutes. This is the maximum time that a job run can consume resources before it is terminated and enters <code>TIMEOUT</code> status. The default is 2,880 minutes (48 hours).</p>" + "documentation":"<p>The job timeout in minutes. This is the maximum time that a job run can consume resources before it is terminated and enters <code>TIMEOUT</code> status. The default is 2,880 minutes (48 hours) for batch jobs.</p> <p>Streaming jobs must have timeout values less than 7 days or 10080 minutes. When the value is left blank, the job will be restarted after 7 days based if you have not setup a maintenance window. If you have setup maintenance window, it will be restarted during the maintenance window after 7 days.</p>" }, "MaxCapacity":{ "shape":"NullableDouble", @@ -15577,6 +15690,11 @@ "documentation":"<p>Defines column statistics supported for integer data columns.</p>" }, "LongValue":{"type":"long"}, + "LongValueString":{ + "type":"string", + "max":16384, + "min":1 + }, "MLTransform":{ "type":"structure", "members":{ @@ -16200,6 +16318,76 @@ "type":"string", "box":true }, + "OAuth2ClientApplication":{ + "type":"structure", + "members":{ + "UserManagedClientApplicationClientId":{ + "shape":"UserManagedClientApplicationClientId", + "documentation":"<p>The client application clientID if the ClientAppType is <code>USER_MANAGED</code>.</p>" + }, + "AWSManagedClientApplicationReference":{ + "shape":"AWSManagedClientApplicationReference", + "documentation":"<p>The reference to the SaaS-side client app that is Amazon Web Services managed.</p>" + } + }, + "documentation":"<p>The OAuth2 client app used for the connection.</p>" + }, + "OAuth2GrantType":{ + "type":"string", + "enum":[ + "AUTHORIZATION_CODE", + "CLIENT_CREDENTIALS", + "JWT_BEARER" + ] + }, + "OAuth2Properties":{ + "type":"structure", + "members":{ + "OAuth2GrantType":{ + "shape":"OAuth2GrantType", + "documentation":"<p>The OAuth2 grant type. For example, <code>AUTHORIZATION_CODE</code>, <code>JWT_BEARER</code>, or <code>CLIENT_CREDENTIALS</code>.</p>" + }, + "OAuth2ClientApplication":{ + "shape":"OAuth2ClientApplication", + "documentation":"<p>The client application type. For example, AWS_MANAGED or USER_MANAGED.</p>" + }, + "TokenUrl":{ + "shape":"TokenUrl", + "documentation":"<p>The URL of the provider's authentication server, to exchange an authorization code for an access token.</p>" + }, + "TokenUrlParametersMap":{ + "shape":"TokenUrlParametersMap", + "documentation":"<p>A map of parameters that are added to the token <code>GET</code> request.</p>" + } + }, + "documentation":"<p>A structure containing properties for OAuth2 authentication.</p>" + }, + "OAuth2PropertiesInput":{ + "type":"structure", + "members":{ + "OAuth2GrantType":{ + "shape":"OAuth2GrantType", + "documentation":"<p>The OAuth2 grant type in the CreateConnection request. For example, <code>AUTHORIZATION_CODE</code>, <code>JWT_BEARER</code>, or <code>CLIENT_CREDENTIALS</code>.</p>" + }, + "OAuth2ClientApplication":{ + "shape":"OAuth2ClientApplication", + "documentation":"<p>The client application type in the CreateConnection request. For example, <code>AWS_MANAGED</code> or <code>USER_MANAGED</code>.</p>" + }, + "TokenUrl":{ + "shape":"TokenUrl", + "documentation":"<p>The URL of the provider's authentication server, to exchange an authorization code for an access token.</p>" + }, + "TokenUrlParametersMap":{ + "shape":"TokenUrlParametersMap", + "documentation":"<p>A map of parameters that are added to the token <code>GET</code> request.</p>" + }, + "AuthorizationCodeProperties":{ + "shape":"AuthorizationCodeProperties", + "documentation":"<p>The set of properties required for the the OAuth2 <code>AUTHORIZATION_CODE</code> grant type.</p>" + } + }, + "documentation":"<p>A structure containing properties for OAuth2 in the CreateConnection request.</p>" + }, "OneInput":{ "type":"list", "member":{"shape":"NodeId"}, @@ -16715,10 +16903,10 @@ }, "AvailabilityZone":{ "shape":"NameString", - "documentation":"<p>The connection's Availability Zone. This field is redundant because the specified subnet implies the Availability Zone to be used. Currently the field must be populated, but it will be deprecated in the future.</p>" + "documentation":"<p>The connection's Availability Zone.</p>" } }, - "documentation":"<p>Specifies the physical requirements for a connection.</p>" + "documentation":"<p>The OAuth client app in GetConnection response.</p>" }, "PiiType":{ "type":"string", @@ -17190,6 +17378,11 @@ }, "documentation":"<p>When crawling an Amazon S3 data source after the first crawl is complete, specifies whether to crawl the entire dataset again or to crawl only folders that were added since the last crawler run. For more information, see <a href=\"https://docs.aws.amazon.com/glue/latest/dg/incremental-crawls.html\">Incremental Crawls in Glue</a> in the developer guide.</p>" }, + "RedirectUri":{ + "type":"string", + "max":512, + "pattern":"^(https?):\\/\\/[^\\s/$.?#].[^\\s]*$" + }, "RedshiftSource":{ "type":"structure", "required":[ @@ -18721,6 +18914,10 @@ } } }, + "SecretArn":{ + "type":"string", + "pattern":"^arn:aws(-(cn|us-gov|iso(-[bef])?))?:secretsmanager:.*$" + }, "SecurityConfiguration":{ "type":"structure", "members":{ @@ -19665,7 +19862,7 @@ }, "Timeout":{ "shape":"Timeout", - "documentation":"<p>The <code>JobRun</code> timeout in minutes. This is the maximum time that a job run can consume resources before it is terminated and enters <code>TIMEOUT</code> status. This value overrides the timeout value set in the parent job.</p> <p>Streaming jobs do not have a timeout. The default for non-streaming jobs is 2,880 minutes (48 hours).</p>" + "documentation":"<p>The <code>JobRun</code> timeout in minutes. This is the maximum time that a job run can consume resources before it is terminated and enters <code>TIMEOUT</code> status. This value overrides the timeout value set in the parent job. </p> <p>Streaming jobs must have timeout values less than 7 days or 10080 minutes. When the value is left blank, the job will be restarted after 7 days based if you have not setup a maintenance window. If you have setup maintenance window, it will be restarted during the maintenance window after 7 days.</p>" }, "MaxCapacity":{ "shape":"NullableDouble", @@ -20333,6 +20530,10 @@ "TargetTable":{ "shape":"TableIdentifier", "documentation":"<p>A <code>TableIdentifier</code> structure that describes a target table for resource linking.</p>" + }, + "ViewDefinition":{ + "shape":"ViewDefinitionInput", + "documentation":"<p>A structure that contains all the information that defines the view, including the dialect or dialects for the view, and the query.</p>" } }, "documentation":"<p>A structure used to define a table.</p>" @@ -20674,6 +20875,26 @@ "Timestamp":{"type":"timestamp"}, "TimestampValue":{"type":"timestamp"}, "Token":{"type":"string"}, + "TokenUrl":{ + "type":"string", + "max":256, + "pattern":"^(https?)://[-a-zA-Z0-9+&@#/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#/%=~_|]" + }, + "TokenUrlParameterKey":{ + "type":"string", + "max":128, + "min":1 + }, + "TokenUrlParameterValue":{ + "type":"string", + "max":512, + "min":1 + }, + "TokenUrlParametersMap":{ + "type":"map", + "key":{"shape":"TokenUrlParameterKey"}, + "value":{"shape":"TokenUrlParameterValue"} + }, "Topk":{ "type":"integer", "box":true, @@ -21874,6 +22095,14 @@ "VersionId":{ "shape":"VersionString", "documentation":"<p>The version ID at which to update the table contents. </p>" + }, + "ViewUpdateAction":{ + "shape":"ViewUpdateAction", + "documentation":"<p>The operation to be performed when updating the view.</p>" + }, + "Force":{ + "shape":"Boolean", + "documentation":"<p>A flag that can be set to true to ignore matching storage descriptor and subobject matching requirements.</p>" } } }, @@ -22077,6 +22306,11 @@ "type":"list", "member":{"shape":"UserDefinedFunction"} }, + "UserManagedClientApplicationClientId":{ + "type":"string", + "max":2048, + "pattern":"\\S+" + }, "ValidationException":{ "type":"structure", "members":{ @@ -22147,6 +22381,28 @@ }, "documentation":"<p>A structure containing details for representations.</p>" }, + "ViewDefinitionInput":{ + "type":"structure", + "members":{ + "IsProtected":{ + "shape":"NullableBoolean", + "documentation":"<p>You can set this flag as true to instruct the engine not to push user-provided operations into the logical plan of the view during query planning. However, setting this flag does not guarantee that the engine will comply. Refer to the engine's documentation to understand the guarantees provided, if any.</p>" + }, + "Definer":{ + "shape":"ArnString", + "documentation":"<p>The definer of a view in SQL.</p>" + }, + "Representations":{ + "shape":"ViewRepresentationInputList", + "documentation":"<p>A list of structures that contains the dialect of the view, and the query that defines the view.</p>" + }, + "SubObjects":{ + "shape":"ViewSubObjectsList", + "documentation":"<p>A list of base table ARNs that make up the view.</p>" + } + }, + "documentation":"<p>A structure containing details for creating or updating an Glue view.</p>" + }, "ViewDialect":{ "type":"string", "enum":[ @@ -22177,7 +22433,11 @@ }, "ViewExpandedText":{ "shape":"ViewTextString", - "documentation":"<p>The expanded SQL for the view. This SQL is used by engines while processing a query on a view. Engines may perform operations during view creation to transform <code>ViewOriginalText</code> to <code>ViewExpandedText</code>. For example:</p> <ul> <li> <p>Fully qualify identifiers: <code>SELECT * from table1 → SELECT * from db1.table1</code> </p> </li> </ul>" + "documentation":"<p>The expanded SQL for the view. This SQL is used by engines while processing a query on a view. Engines may perform operations during view creation to transform <code>ViewOriginalText</code> to <code>ViewExpandedText</code>. For example:</p> <ul> <li> <p>Fully qualified identifiers: <code>SELECT * from table1 -> SELECT * from db1.table1</code> </p> </li> </ul>" + }, + "ValidationConnection":{ + "shape":"NameString", + "documentation":"<p>The name of the connection to be used to validate the specific representation of the view.</p>" }, "IsStale":{ "shape":"NullableBoolean", @@ -22186,6 +22446,38 @@ }, "documentation":"<p>A structure that contains the dialect of the view, and the query that defines the view.</p>" }, + "ViewRepresentationInput":{ + "type":"structure", + "members":{ + "Dialect":{ + "shape":"ViewDialect", + "documentation":"<p>A parameter that specifies the engine type of a specific representation.</p>" + }, + "DialectVersion":{ + "shape":"ViewDialectVersionString", + "documentation":"<p>A parameter that specifies the version of the engine of a specific representation.</p>" + }, + "ViewOriginalText":{ + "shape":"ViewTextString", + "documentation":"<p>A string that represents the original SQL query that describes the view.</p>" + }, + "ValidationConnection":{ + "shape":"NameString", + "documentation":"<p>The name of the connection to be used to validate the specific representation of the view.</p>" + }, + "ViewExpandedText":{ + "shape":"ViewTextString", + "documentation":"<p>A string that represents the SQL query that describes the view with expanded resource ARNs</p>" + } + }, + "documentation":"<p>A structure containing details of a representation to update or create a Lake Formation view.</p>" + }, + "ViewRepresentationInputList":{ + "type":"list", + "member":{"shape":"ViewRepresentationInput"}, + "max":10, + "min":1 + }, "ViewRepresentationList":{ "type":"list", "member":{"shape":"ViewRepresentation"}, @@ -22202,6 +22494,15 @@ "type":"string", "max":409600 }, + "ViewUpdateAction":{ + "type":"string", + "enum":[ + "ADD", + "REPLACE", + "ADD_OR_REPLACE", + "DROP" + ] + }, "WorkerType":{ "type":"string", "enum":[ diff --git a/services/grafana/pom.xml b/services/grafana/pom.xml index 2b9324a9edc9..95924e521628 100644 --- a/services/grafana/pom.xml +++ b/services/grafana/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>grafana</artifactId> <name>AWS Java SDK :: Services :: Grafana</name> diff --git a/services/greengrass/pom.xml b/services/greengrass/pom.xml index efa29b46ede7..9525edf51d0c 100644 --- a/services/greengrass/pom.xml +++ b/services/greengrass/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>greengrass</artifactId> <name>AWS Java SDK :: Services :: AWS Greengrass</name> diff --git a/services/greengrassv2/pom.xml b/services/greengrassv2/pom.xml index 48a823dfaaf7..b60db109720e 100644 --- a/services/greengrassv2/pom.xml +++ b/services/greengrassv2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>greengrassv2</artifactId> <name>AWS Java SDK :: Services :: Greengrass V2</name> diff --git a/services/groundstation/pom.xml b/services/groundstation/pom.xml index 4f827e83134e..6184159c33c9 100644 --- a/services/groundstation/pom.xml +++ b/services/groundstation/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>groundstation</artifactId> <name>AWS Java SDK :: Services :: GroundStation</name> diff --git a/services/guardduty/pom.xml b/services/guardduty/pom.xml index d30525a11ab8..57d4b6948d97 100644 --- a/services/guardduty/pom.xml +++ b/services/guardduty/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>guardduty</artifactId> diff --git a/services/health/pom.xml b/services/health/pom.xml index 141de4da9ce9..81cfa7e5ddbf 100644 --- a/services/health/pom.xml +++ b/services/health/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>health</artifactId> <name>AWS Java SDK :: Services :: AWS Health APIs and Notifications</name> diff --git a/services/healthlake/pom.xml b/services/healthlake/pom.xml index 90cb3cb0f5f9..83d4f0e2abc6 100644 --- a/services/healthlake/pom.xml +++ b/services/healthlake/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>healthlake</artifactId> <name>AWS Java SDK :: Services :: Health Lake</name> diff --git a/services/iam/pom.xml b/services/iam/pom.xml index ad1a9cbb00f3..3af76fcf4d49 100644 --- a/services/iam/pom.xml +++ b/services/iam/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iam</artifactId> <name>AWS Java SDK :: Services :: AWS IAM</name> diff --git a/services/identitystore/pom.xml b/services/identitystore/pom.xml index ae723abe17fb..4b58a99a36e9 100644 --- a/services/identitystore/pom.xml +++ b/services/identitystore/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>identitystore</artifactId> <name>AWS Java SDK :: Services :: Identitystore</name> diff --git a/services/imagebuilder/pom.xml b/services/imagebuilder/pom.xml index a65d85dd2eb9..639ac26decd6 100644 --- a/services/imagebuilder/pom.xml +++ b/services/imagebuilder/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>imagebuilder</artifactId> <name>AWS Java SDK :: Services :: Imagebuilder</name> diff --git a/services/inspector/pom.xml b/services/inspector/pom.xml index 45740d143e54..49fc12848618 100644 --- a/services/inspector/pom.xml +++ b/services/inspector/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>inspector</artifactId> <name>AWS Java SDK :: Services :: Amazon Inspector Service</name> diff --git a/services/inspector2/pom.xml b/services/inspector2/pom.xml index 9cfaac531c5d..3827b0b05ca7 100644 --- a/services/inspector2/pom.xml +++ b/services/inspector2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>inspector2</artifactId> <name>AWS Java SDK :: Services :: Inspector2</name> diff --git a/services/inspectorscan/pom.xml b/services/inspectorscan/pom.xml index 923cfb003aac..ea544cd61d50 100644 --- a/services/inspectorscan/pom.xml +++ b/services/inspectorscan/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>inspectorscan</artifactId> <name>AWS Java SDK :: Services :: Inspector Scan</name> diff --git a/services/internetmonitor/pom.xml b/services/internetmonitor/pom.xml index cdab1896c6cf..aae72e4d05e1 100644 --- a/services/internetmonitor/pom.xml +++ b/services/internetmonitor/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>internetmonitor</artifactId> <name>AWS Java SDK :: Services :: Internet Monitor</name> diff --git a/services/iot/pom.xml b/services/iot/pom.xml index 1112a431b2cf..b6558f938c97 100644 --- a/services/iot/pom.xml +++ b/services/iot/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iot</artifactId> <name>AWS Java SDK :: Services :: AWS IoT</name> diff --git a/services/iot1clickdevices/pom.xml b/services/iot1clickdevices/pom.xml index 649f7fc6fbe0..bcf075b768f0 100644 --- a/services/iot1clickdevices/pom.xml +++ b/services/iot1clickdevices/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iot1clickdevices</artifactId> <name>AWS Java SDK :: Services :: IoT 1Click Devices Service</name> diff --git a/services/iot1clickprojects/pom.xml b/services/iot1clickprojects/pom.xml index 1f7bcd352ad9..b20c20215e85 100644 --- a/services/iot1clickprojects/pom.xml +++ b/services/iot1clickprojects/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iot1clickprojects</artifactId> <name>AWS Java SDK :: Services :: IoT 1Click Projects</name> diff --git a/services/iotanalytics/pom.xml b/services/iotanalytics/pom.xml index 8f9571984744..0f928cbef278 100644 --- a/services/iotanalytics/pom.xml +++ b/services/iotanalytics/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iotanalytics</artifactId> <name>AWS Java SDK :: Services :: IoTAnalytics</name> diff --git a/services/iotdataplane/pom.xml b/services/iotdataplane/pom.xml index 6db980fa57e9..586df83c1be3 100644 --- a/services/iotdataplane/pom.xml +++ b/services/iotdataplane/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iotdataplane</artifactId> <name>AWS Java SDK :: Services :: AWS IoT Data Plane</name> diff --git a/services/iotdeviceadvisor/pom.xml b/services/iotdeviceadvisor/pom.xml index 1887e3a94414..1f693a8ecf22 100644 --- a/services/iotdeviceadvisor/pom.xml +++ b/services/iotdeviceadvisor/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iotdeviceadvisor</artifactId> <name>AWS Java SDK :: Services :: Iot Device Advisor</name> diff --git a/services/iotevents/pom.xml b/services/iotevents/pom.xml index 98f582f0757a..6b7efd444c06 100644 --- a/services/iotevents/pom.xml +++ b/services/iotevents/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iotevents</artifactId> <name>AWS Java SDK :: Services :: IoT Events</name> diff --git a/services/ioteventsdata/pom.xml b/services/ioteventsdata/pom.xml index 32d2dd4735e6..409b1dfd7490 100644 --- a/services/ioteventsdata/pom.xml +++ b/services/ioteventsdata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ioteventsdata</artifactId> <name>AWS Java SDK :: Services :: IoT Events Data</name> diff --git a/services/iotfleethub/pom.xml b/services/iotfleethub/pom.xml index c441dacbb817..fdf1bdfc2d8b 100644 --- a/services/iotfleethub/pom.xml +++ b/services/iotfleethub/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iotfleethub</artifactId> <name>AWS Java SDK :: Services :: Io T Fleet Hub</name> diff --git a/services/iotfleetwise/pom.xml b/services/iotfleetwise/pom.xml index 3a5622cd3fab..1c9cb322bf4d 100644 --- a/services/iotfleetwise/pom.xml +++ b/services/iotfleetwise/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iotfleetwise</artifactId> <name>AWS Java SDK :: Services :: Io T Fleet Wise</name> diff --git a/services/iotjobsdataplane/pom.xml b/services/iotjobsdataplane/pom.xml index c72b2af318f0..f4d3cbd85c55 100644 --- a/services/iotjobsdataplane/pom.xml +++ b/services/iotjobsdataplane/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iotjobsdataplane</artifactId> <name>AWS Java SDK :: Services :: IoT Jobs Data Plane</name> diff --git a/services/iotsecuretunneling/pom.xml b/services/iotsecuretunneling/pom.xml index d6869f0acdc0..598598208246 100644 --- a/services/iotsecuretunneling/pom.xml +++ b/services/iotsecuretunneling/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iotsecuretunneling</artifactId> <name>AWS Java SDK :: Services :: IoTSecureTunneling</name> diff --git a/services/iotsitewise/pom.xml b/services/iotsitewise/pom.xml index 38f72c7c2737..30e24f57599b 100644 --- a/services/iotsitewise/pom.xml +++ b/services/iotsitewise/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iotsitewise</artifactId> <name>AWS Java SDK :: Services :: Io T Site Wise</name> diff --git a/services/iotthingsgraph/pom.xml b/services/iotthingsgraph/pom.xml index 143268716ce2..0e4c62e19ecb 100644 --- a/services/iotthingsgraph/pom.xml +++ b/services/iotthingsgraph/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iotthingsgraph</artifactId> <name>AWS Java SDK :: Services :: IoTThingsGraph</name> diff --git a/services/iottwinmaker/pom.xml b/services/iottwinmaker/pom.xml index 975958fec7c7..400812eec3ab 100644 --- a/services/iottwinmaker/pom.xml +++ b/services/iottwinmaker/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iottwinmaker</artifactId> <name>AWS Java SDK :: Services :: Io T Twin Maker</name> diff --git a/services/iotwireless/pom.xml b/services/iotwireless/pom.xml index a9ff3f5d1a05..a5fc9872faa1 100644 --- a/services/iotwireless/pom.xml +++ b/services/iotwireless/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>iotwireless</artifactId> <name>AWS Java SDK :: Services :: IoT Wireless</name> diff --git a/services/iotwireless/src/main/resources/codegen-resources/service-2.json b/services/iotwireless/src/main/resources/codegen-resources/service-2.json index 840f1342f124..abb9ee7f49bc 100644 --- a/services/iotwireless/src/main/resources/codegen-resources/service-2.json +++ b/services/iotwireless/src/main/resources/codegen-resources/service-2.json @@ -4,6 +4,7 @@ "apiVersion":"2020-11-22", "endpointPrefix":"api.iotwireless", "protocol":"rest-json", + "protocols":["rest-json"], "serviceFullName":"AWS IoT Wireless", "serviceId":"IoT Wireless", "signatureVersion":"v4", @@ -3936,7 +3937,8 @@ "MissingFrag", "MemoryError", "MICError", - "Successful" + "Successful", + "Device_exist_in_conflict_fuota_task" ] }, "FuotaTask":{ diff --git a/services/ivs/pom.xml b/services/ivs/pom.xml index f23dc872572c..6d68e33f3fcb 100644 --- a/services/ivs/pom.xml +++ b/services/ivs/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ivs</artifactId> <name>AWS Java SDK :: Services :: Ivs</name> diff --git a/services/ivschat/pom.xml b/services/ivschat/pom.xml index 9336bbecf1b9..6376c984705d 100644 --- a/services/ivschat/pom.xml +++ b/services/ivschat/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ivschat</artifactId> <name>AWS Java SDK :: Services :: Ivschat</name> diff --git a/services/ivsrealtime/pom.xml b/services/ivsrealtime/pom.xml index bc57bd236c0d..d6007499bd2e 100644 --- a/services/ivsrealtime/pom.xml +++ b/services/ivsrealtime/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ivsrealtime</artifactId> <name>AWS Java SDK :: Services :: IVS Real Time</name> diff --git a/services/kafka/pom.xml b/services/kafka/pom.xml index 7e53d5e5666f..a913c744d5a7 100644 --- a/services/kafka/pom.xml +++ b/services/kafka/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>kafka</artifactId> <name>AWS Java SDK :: Services :: Kafka</name> diff --git a/services/kafkaconnect/pom.xml b/services/kafkaconnect/pom.xml index 48456f7b791a..f1d0c87eeab3 100644 --- a/services/kafkaconnect/pom.xml +++ b/services/kafkaconnect/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>kafkaconnect</artifactId> <name>AWS Java SDK :: Services :: Kafka Connect</name> diff --git a/services/kendra/pom.xml b/services/kendra/pom.xml index 93f1bb21c59a..3bb28db61afa 100644 --- a/services/kendra/pom.xml +++ b/services/kendra/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>kendra</artifactId> <name>AWS Java SDK :: Services :: Kendra</name> diff --git a/services/kendraranking/pom.xml b/services/kendraranking/pom.xml index ed252782b0d2..7c78b363e942 100644 --- a/services/kendraranking/pom.xml +++ b/services/kendraranking/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>kendraranking</artifactId> <name>AWS Java SDK :: Services :: Kendra Ranking</name> diff --git a/services/keyspaces/pom.xml b/services/keyspaces/pom.xml index b3b917216da2..884534f733a8 100644 --- a/services/keyspaces/pom.xml +++ b/services/keyspaces/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>keyspaces</artifactId> <name>AWS Java SDK :: Services :: Keyspaces</name> diff --git a/services/kinesis/pom.xml b/services/kinesis/pom.xml index 30a3735d5bf4..6d89caf1d32e 100644 --- a/services/kinesis/pom.xml +++ b/services/kinesis/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>kinesis</artifactId> <name>AWS Java SDK :: Services :: Amazon Kinesis</name> diff --git a/services/kinesisanalytics/pom.xml b/services/kinesisanalytics/pom.xml index 949d3b0d1e22..9ce2343857b0 100644 --- a/services/kinesisanalytics/pom.xml +++ b/services/kinesisanalytics/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>kinesisanalytics</artifactId> <name>AWS Java SDK :: Services :: Amazon Kinesis Analytics</name> diff --git a/services/kinesisanalyticsv2/pom.xml b/services/kinesisanalyticsv2/pom.xml index 0759ec3242d9..7f2e013aa00f 100644 --- a/services/kinesisanalyticsv2/pom.xml +++ b/services/kinesisanalyticsv2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>kinesisanalyticsv2</artifactId> <name>AWS Java SDK :: Services :: Kinesis Analytics V2</name> diff --git a/services/kinesisvideo/pom.xml b/services/kinesisvideo/pom.xml index 7e025b9ea33e..1db4e2288f20 100644 --- a/services/kinesisvideo/pom.xml +++ b/services/kinesisvideo/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>kinesisvideo</artifactId> diff --git a/services/kinesisvideoarchivedmedia/pom.xml b/services/kinesisvideoarchivedmedia/pom.xml index fdee4e6e0e52..8c5826e0c140 100644 --- a/services/kinesisvideoarchivedmedia/pom.xml +++ b/services/kinesisvideoarchivedmedia/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>kinesisvideoarchivedmedia</artifactId> <name>AWS Java SDK :: Services :: Kinesis Video Archived Media</name> diff --git a/services/kinesisvideomedia/pom.xml b/services/kinesisvideomedia/pom.xml index 04ecb42a9533..637c83d9f56a 100644 --- a/services/kinesisvideomedia/pom.xml +++ b/services/kinesisvideomedia/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>kinesisvideomedia</artifactId> <name>AWS Java SDK :: Services :: Kinesis Video Media</name> diff --git a/services/kinesisvideosignaling/pom.xml b/services/kinesisvideosignaling/pom.xml index d20c45535b1c..e7a7bcc11da7 100644 --- a/services/kinesisvideosignaling/pom.xml +++ b/services/kinesisvideosignaling/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>kinesisvideosignaling</artifactId> <name>AWS Java SDK :: Services :: Kinesis Video Signaling</name> diff --git a/services/kinesisvideowebrtcstorage/pom.xml b/services/kinesisvideowebrtcstorage/pom.xml index 987d7c22bf33..020384707e32 100644 --- a/services/kinesisvideowebrtcstorage/pom.xml +++ b/services/kinesisvideowebrtcstorage/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>kinesisvideowebrtcstorage</artifactId> <name>AWS Java SDK :: Services :: Kinesis Video Web RTC Storage</name> diff --git a/services/kms/pom.xml b/services/kms/pom.xml index f795027c2ad9..858cfb572ae7 100644 --- a/services/kms/pom.xml +++ b/services/kms/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>kms</artifactId> <name>AWS Java SDK :: Services :: AWS KMS</name> diff --git a/services/lakeformation/pom.xml b/services/lakeformation/pom.xml index dc0eafab1be7..5d1559ff9720 100644 --- a/services/lakeformation/pom.xml +++ b/services/lakeformation/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>lakeformation</artifactId> <name>AWS Java SDK :: Services :: LakeFormation</name> diff --git a/services/lambda/pom.xml b/services/lambda/pom.xml index 86fe9e8c83d4..67d54a5e528f 100644 --- a/services/lambda/pom.xml +++ b/services/lambda/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>lambda</artifactId> <name>AWS Java SDK :: Services :: AWS Lambda</name> diff --git a/services/launchwizard/pom.xml b/services/launchwizard/pom.xml index 7d2324a9e427..c6a347a1c92f 100644 --- a/services/launchwizard/pom.xml +++ b/services/launchwizard/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>launchwizard</artifactId> <name>AWS Java SDK :: Services :: Launch Wizard</name> diff --git a/services/lexmodelbuilding/pom.xml b/services/lexmodelbuilding/pom.xml index 99142b14d4a4..2bf425058d64 100644 --- a/services/lexmodelbuilding/pom.xml +++ b/services/lexmodelbuilding/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>lexmodelbuilding</artifactId> <name>AWS Java SDK :: Services :: Amazon Lex Model Building</name> diff --git a/services/lexmodelsv2/pom.xml b/services/lexmodelsv2/pom.xml index a8699a7263d2..779b94a98a0d 100644 --- a/services/lexmodelsv2/pom.xml +++ b/services/lexmodelsv2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>lexmodelsv2</artifactId> <name>AWS Java SDK :: Services :: Lex Models V2</name> diff --git a/services/lexruntime/pom.xml b/services/lexruntime/pom.xml index b3dfcbbe0854..cc15ec55676c 100644 --- a/services/lexruntime/pom.xml +++ b/services/lexruntime/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>lexruntime</artifactId> <name>AWS Java SDK :: Services :: Amazon Lex Runtime</name> diff --git a/services/lexruntimev2/pom.xml b/services/lexruntimev2/pom.xml index 6cdd950d8169..22ac60bbe07a 100644 --- a/services/lexruntimev2/pom.xml +++ b/services/lexruntimev2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>lexruntimev2</artifactId> <name>AWS Java SDK :: Services :: Lex Runtime V2</name> diff --git a/services/licensemanager/pom.xml b/services/licensemanager/pom.xml index 09a76e11abf0..6719ea17fd00 100644 --- a/services/licensemanager/pom.xml +++ b/services/licensemanager/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>licensemanager</artifactId> <name>AWS Java SDK :: Services :: License Manager</name> diff --git a/services/licensemanagerlinuxsubscriptions/pom.xml b/services/licensemanagerlinuxsubscriptions/pom.xml index 7a98342b2041..304f79da43cc 100644 --- a/services/licensemanagerlinuxsubscriptions/pom.xml +++ b/services/licensemanagerlinuxsubscriptions/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>licensemanagerlinuxsubscriptions</artifactId> <name>AWS Java SDK :: Services :: License Manager Linux Subscriptions</name> diff --git a/services/licensemanagerusersubscriptions/pom.xml b/services/licensemanagerusersubscriptions/pom.xml index 5e52b99b33ca..cc8e032373ad 100644 --- a/services/licensemanagerusersubscriptions/pom.xml +++ b/services/licensemanagerusersubscriptions/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>licensemanagerusersubscriptions</artifactId> <name>AWS Java SDK :: Services :: License Manager User Subscriptions</name> diff --git a/services/lightsail/pom.xml b/services/lightsail/pom.xml index c6e3f7c2a7df..3a217f41f77e 100644 --- a/services/lightsail/pom.xml +++ b/services/lightsail/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>lightsail</artifactId> <name>AWS Java SDK :: Services :: Amazon Lightsail</name> diff --git a/services/location/pom.xml b/services/location/pom.xml index 087145521b1e..31b03a8f7f92 100644 --- a/services/location/pom.xml +++ b/services/location/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>location</artifactId> <name>AWS Java SDK :: Services :: Location</name> diff --git a/services/location/src/main/resources/codegen-resources/paginators-1.json b/services/location/src/main/resources/codegen-resources/paginators-1.json index 24ca27f63d8d..8f919c6b6768 100644 --- a/services/location/src/main/resources/codegen-resources/paginators-1.json +++ b/services/location/src/main/resources/codegen-resources/paginators-1.json @@ -1,5 +1,11 @@ { "pagination": { + "ForecastGeofenceEvents": { + "input_token": "NextToken", + "output_token": "NextToken", + "limit_key": "MaxResults", + "result_key": "ForecastedEvents" + }, "GetDevicePositionHistory": { "input_token": "NextToken", "output_token": "NextToken", diff --git a/services/location/src/main/resources/codegen-resources/service-2.json b/services/location/src/main/resources/codegen-resources/service-2.json index d9ac4344fe22..c9deaf2ba2b2 100644 --- a/services/location/src/main/resources/codegen-resources/service-2.json +++ b/services/location/src/main/resources/codegen-resources/service-2.json @@ -3,8 +3,8 @@ "metadata":{ "apiVersion":"2020-11-19", "endpointPrefix":"geo", - "jsonVersion":"1.1", "protocol":"rest-json", + "protocols":["rest-json"], "serviceFullName":"Amazon Location Service", "serviceId":"Location", "signatureVersion":"v4", @@ -564,6 +564,25 @@ "documentation":"<p>Removes the association between a tracker resource and a geofence collection.</p> <note> <p>Once you unlink a tracker resource from a geofence collection, the tracker positions will no longer be automatically evaluated against geofences.</p> </note>", "endpoint":{"hostPrefix":"cp.tracking."} }, + "ForecastGeofenceEvents":{ + "name":"ForecastGeofenceEvents", + "http":{ + "method":"POST", + "requestUri":"/geofencing/v0/collections/{CollectionName}/forecast-geofence-events", + "responseCode":200 + }, + "input":{"shape":"ForecastGeofenceEventsRequest"}, + "output":{"shape":"ForecastGeofenceEventsResponse"}, + "errors":[ + {"shape":"InternalServerException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"ThrottlingException"} + ], + "documentation":"<p>Evaluates device positions against geofence geometries from a given geofence collection. The event forecasts three states for which a device can be in relative to a geofence:</p> <p> <code>ENTER</code>: If a device is outside of a geofence, but would breach the fence if the device is moving at its current speed within time horizon window.</p> <p> <code>EXIT</code>: If a device is inside of a geofence, but would breach the fence if the device is moving at its current speed within time horizon window.</p> <p> <code>IDLE</code>: If a device is inside of a geofence, and the device is not moving.</p>", + "endpoint":{"hostPrefix":"geofencing."} + }, "GetDevicePosition":{ "name":"GetDevicePosition", "http":{ @@ -618,7 +637,7 @@ {"shape":"ValidationException"}, {"shape":"ThrottlingException"} ], - "documentation":"<p>Retrieves the geofence details from a geofence collection.</p>", + "documentation":"<p>Retrieves the geofence details from a geofence collection.</p> <note> <p>The returned geometry will always match the geometry format used when the geofence was created.</p> </note>", "endpoint":{"hostPrefix":"geofencing."} }, "GetMapGlyphs":{ @@ -1134,6 +1153,25 @@ "documentation":"<p>Updates the specified properties of a given tracker resource.</p>", "endpoint":{"hostPrefix":"cp.tracking."}, "idempotent":true + }, + "VerifyDevicePosition":{ + "name":"VerifyDevicePosition", + "http":{ + "method":"POST", + "requestUri":"/tracking/v0/trackers/{TrackerName}/positions/verify", + "responseCode":200 + }, + "input":{"shape":"VerifyDevicePositionRequest"}, + "output":{"shape":"VerifyDevicePositionResponse"}, + "errors":[ + {"shape":"InternalServerException"}, + {"shape":"ResourceNotFoundException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"ThrottlingException"} + ], + "documentation":"<p>Verifies the integrity of the device's position by determining if it was reported behind a proxy, and by comparing it to an inferred position estimated based on the device's state.</p>", + "endpoint":{"hostPrefix":"tracking."} } }, "shapes":{ @@ -1163,7 +1201,7 @@ "type":"string", "max":200, "min":5, - "pattern":"^geo:\\w*\\*?$" + "pattern":"(geo|geo-routes|geo-places|geo-maps):\\w*\\*?" }, "ApiKeyFilter":{ "type":"structure", @@ -1186,13 +1224,13 @@ "shape":"ApiKeyRestrictionsAllowActionsList", "documentation":"<p>A list of allowed actions that an API key resource grants permissions to perform. You must have at least one action for each type of resource. For example, if you have a place resource, you must include at least one place action.</p> <p>The following are valid values for the actions.</p> <ul> <li> <p> <b>Map actions</b> </p> <ul> <li> <p> <code>geo:GetMap*</code> - Allows all actions needed for map rendering.</p> </li> </ul> </li> <li> <p> <b>Place actions</b> </p> <ul> <li> <p> <code>geo:SearchPlaceIndexForText</code> - Allows geocoding.</p> </li> <li> <p> <code>geo:SearchPlaceIndexForPosition</code> - Allows reverse geocoding.</p> </li> <li> <p> <code>geo:SearchPlaceIndexForSuggestions</code> - Allows generating suggestions from text.</p> </li> <li> <p> <code>GetPlace</code> - Allows finding a place by place ID.</p> </li> </ul> </li> <li> <p> <b>Route actions</b> </p> <ul> <li> <p> <code>geo:CalculateRoute</code> - Allows point to point routing.</p> </li> <li> <p> <code>geo:CalculateRouteMatrix</code> - Allows calculating a matrix of routes.</p> </li> </ul> </li> </ul> <note> <p>You must use these strings exactly. For example, to provide access to map rendering, the only valid action is <code>geo:GetMap*</code> as an input to the list. <code>[\"geo:GetMap*\"]</code> is valid but <code>[\"geo:GetMapTile\"]</code> is not. Similarly, you cannot use <code>[\"geo:SearchPlaceIndexFor*\"]</code> - you must list each of the Place actions separately.</p> </note>" }, - "AllowReferers":{ - "shape":"ApiKeyRestrictionsAllowReferersList", - "documentation":"<p>An optional list of allowed HTTP referers for which requests must originate from. Requests using this API key from other domains will not be allowed.</p> <p>Requirements:</p> <ul> <li> <p>Contain only alphanumeric characters (A–Z, a–z, 0–9) or any symbols in this list <code>$\\-._+!*`(),;/?:@=&</code> </p> </li> <li> <p>May contain a percent (%) if followed by 2 hexadecimal digits (A-F, a-f, 0-9); this is used for URL encoding purposes.</p> </li> <li> <p>May contain wildcard characters question mark (?) and asterisk (*).</p> <p>Question mark (?) will replace any single character (including hexadecimal digits).</p> <p>Asterisk (*) will replace any multiple characters (including multiple hexadecimal digits).</p> </li> <li> <p>No spaces allowed. For example, <code>https://example.com</code>.</p> </li> </ul>" - }, "AllowResources":{ "shape":"ApiKeyRestrictionsAllowResourcesList", "documentation":"<p>A list of allowed resource ARNs that a API key bearer can perform actions on.</p> <ul> <li> <p>The ARN must be the correct ARN for a map, place, or route ARN. You may include wildcards in the resource-id to match multiple resources of the same type.</p> </li> <li> <p>The resources must be in the same <code>partition</code>, <code>region</code>, and <code>account-id</code> as the key that is being created.</p> </li> <li> <p>Other than wildcards, you must include the full ARN, including the <code>arn</code>, <code>partition</code>, <code>service</code>, <code>region</code>, <code>account-id</code> and <code>resource-id</code> delimited by colons (:).</p> </li> <li> <p>No spaces allowed, even with wildcards. For example, <code>arn:aws:geo:region:<i>account-id</i>:map/ExampleMap*</code>.</p> </li> </ul> <p>For more information about ARN format, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Names (ARNs)</a>.</p>" + }, + "AllowReferers":{ + "shape":"ApiKeyRestrictionsAllowReferersList", + "documentation":"<p>An optional list of allowed HTTP referers for which requests must originate from. Requests using this API key from other domains will not be allowed.</p> <p>Requirements:</p> <ul> <li> <p>Contain only alphanumeric characters (A–Z, a–z, 0–9) or any symbols in this list <code>$\\-._+!*`(),;/?:@=&</code> </p> </li> <li> <p>May contain a percent (%) if followed by 2 hexadecimal digits (A-F, a-f, 0-9); this is used for URL encoding purposes.</p> </li> <li> <p>May contain wildcard characters question mark (?) and asterisk (*).</p> <p>Question mark (?) will replace any single character (including hexadecimal digits).</p> <p>Asterisk (*) will replace any multiple characters (including multiple hexadecimal digits).</p> </li> <li> <p>No spaces allowed. For example, <code>https://example.com</code>.</p> </li> </ul>" } }, "documentation":"<p>API Restrictions on the allowed actions, resources, and referers for an API key resource.</p>" @@ -1211,7 +1249,7 @@ }, "ApiKeyRestrictionsAllowResourcesList":{ "type":"list", - "member":{"shape":"GeoArn"}, + "member":{"shape":"GeoArnV2"}, "max":5, "min":1 }, @@ -1219,7 +1257,7 @@ "type":"string", "max":1600, "min":0, - "pattern":"^arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9]+)*)?){2}:([^/].*)?$" + "pattern":"arn(:[a-z0-9]+([.-][a-z0-9]+)*){2}(:([a-z0-9]+([.-][a-z0-9]+)*)?){2}:([^/].*)?" }, "ArnList":{ "type":"list", @@ -1228,19 +1266,19 @@ "AssociateTrackerConsumerRequest":{ "type":"structure", "required":[ - "ConsumerArn", - "TrackerName" + "TrackerName", + "ConsumerArn" ], "members":{ - "ConsumerArn":{ - "shape":"Arn", - "documentation":"<p>The Amazon Resource Name (ARN) for the geofence collection to be associated to tracker resource. Used when you need to specify a resource across all Amazon Web Services.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:geofence-collection/ExampleGeofenceCollectionConsumer</code> </p> </li> </ul>" - }, "TrackerName":{ "shape":"ResourceName", "documentation":"<p>The name of the tracker resource to be associated with a geofence collection.</p>", "location":"uri", "locationName":"TrackerName" + }, + "ConsumerArn":{ + "shape":"Arn", + "documentation":"<p>The Amazon Resource Name (ARN) for the geofence collection to be associated to tracker resource. Used when you need to specify a resource across all Amazon Web Services.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:geofence-collection/ExampleGeofenceCollectionConsumer</code> </p> </li> </ul>" } } }, @@ -1249,6 +1287,12 @@ "members":{ } }, + "Base64EncodedGeobuf":{ + "type":"blob", + "max":600000, + "min":0, + "sensitive":true + }, "BatchDeleteDevicePositionHistoryError":{ "type":"structure", "required":[ @@ -1271,19 +1315,19 @@ "BatchDeleteDevicePositionHistoryRequest":{ "type":"structure", "required":[ - "DeviceIds", - "TrackerName" + "TrackerName", + "DeviceIds" ], "members":{ - "DeviceIds":{ - "shape":"BatchDeleteDevicePositionHistoryRequestDeviceIdsList", - "documentation":"<p>Devices whose position history you want to delete.</p> <ul> <li> <p>For example, for two devices: <code>“DeviceIds” : [DeviceId1,DeviceId2]</code> </p> </li> </ul>" - }, "TrackerName":{ "shape":"ResourceName", "documentation":"<p>The name of the tracker resource to delete the device position history from.</p>", "location":"uri", "locationName":"TrackerName" + }, + "DeviceIds":{ + "shape":"BatchDeleteDevicePositionHistoryRequestDeviceIdsList", + "documentation":"<p>Devices whose position history you want to delete.</p> <ul> <li> <p>For example, for two devices: <code>“DeviceIds” : [DeviceId1,DeviceId2]</code> </p> </li> </ul>" } } }, @@ -1306,17 +1350,17 @@ "BatchDeleteGeofenceError":{ "type":"structure", "required":[ - "Error", - "GeofenceId" + "GeofenceId", + "Error" ], "members":{ - "Error":{ - "shape":"BatchItemError", - "documentation":"<p>Contains details associated to the batch error.</p>" - }, "GeofenceId":{ "shape":"Id", "documentation":"<p>The geofence associated with the error message.</p>" + }, + "Error":{ + "shape":"BatchItemError", + "documentation":"<p>Contains details associated to the batch error.</p>" } }, "documentation":"<p>Contains error details for each geofence that failed to delete from the geofence collection.</p>" @@ -1364,21 +1408,21 @@ "type":"structure", "required":[ "DeviceId", - "Error", - "SampleTime" + "SampleTime", + "Error" ], "members":{ "DeviceId":{ "shape":"Id", "documentation":"<p>The device associated with the position evaluation error.</p>" }, - "Error":{ - "shape":"BatchItemError", - "documentation":"<p>Contains details associated to the batch error.</p>" - }, "SampleTime":{ "shape":"Timestamp", "documentation":"<p>Specifies a timestamp for when the error occurred in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" + }, + "Error":{ + "shape":"BatchItemError", + "documentation":"<p>Contains details associated to the batch error.</p>" } }, "documentation":"<p>Contains error details for each device that failed to evaluate its position against the geofences in a given geofence collection.</p>" @@ -1447,19 +1491,19 @@ "BatchGetDevicePositionRequest":{ "type":"structure", "required":[ - "DeviceIds", - "TrackerName" + "TrackerName", + "DeviceIds" ], "members":{ - "DeviceIds":{ - "shape":"BatchGetDevicePositionRequestDeviceIdsList", - "documentation":"<p>Devices whose position you want to retrieve.</p> <ul> <li> <p>For example, for two devices: <code>device-ids=DeviceId1&device-ids=DeviceId2</code> </p> </li> </ul>" - }, "TrackerName":{ "shape":"BatchGetDevicePositionRequestTrackerNameString", "documentation":"<p>The tracker resource retrieving the device position.</p>", "location":"uri", "locationName":"TrackerName" + }, + "DeviceIds":{ + "shape":"BatchGetDevicePositionRequestDeviceIdsList", + "documentation":"<p>Devices whose position you want to retrieve.</p> <ul> <li> <p>For example, for two devices: <code>device-ids=DeviceId1&device-ids=DeviceId2</code> </p> </li> </ul>" } } }, @@ -1472,22 +1516,22 @@ "BatchGetDevicePositionRequestTrackerNameString":{ "type":"string", "min":1, - "pattern":"^[-._\\w]+$" + "pattern":"[-._\\w]+" }, "BatchGetDevicePositionResponse":{ "type":"structure", "required":[ - "DevicePositions", - "Errors" + "Errors", + "DevicePositions" ], "members":{ - "DevicePositions":{ - "shape":"DevicePositionList", - "documentation":"<p>Contains device position details such as the device ID, position, and timestamps for when the position was received and sampled.</p>" - }, "Errors":{ "shape":"BatchGetDevicePositionErrorList", "documentation":"<p>Contains error details for each device that failed to send its position to the tracker resource.</p>" + }, + "DevicePositions":{ + "shape":"DevicePositionList", + "documentation":"<p>Contains device position details such as the device ID, position, and timestamps for when the position was received and sampled.</p>" } } }, @@ -1519,17 +1563,17 @@ "BatchPutGeofenceError":{ "type":"structure", "required":[ - "Error", - "GeofenceId" + "GeofenceId", + "Error" ], "members":{ - "Error":{ - "shape":"BatchItemError", - "documentation":"<p>Contains details associated to the batch error.</p>" - }, "GeofenceId":{ "shape":"Id", "documentation":"<p>The geofence associated with the error message.</p>" + }, + "Error":{ + "shape":"BatchItemError", + "documentation":"<p>Contains details associated to the batch error.</p>" } }, "documentation":"<p>Contains error details for each geofence that failed to be stored in a given geofence collection.</p>" @@ -1574,13 +1618,13 @@ "shape":"Id", "documentation":"<p>The identifier for the geofence to be stored in a given geofence collection.</p>" }, + "Geometry":{ + "shape":"GeofenceGeometry", + "documentation":"<p>Contains the details to specify the position of the geofence. Can be a polygon, a circle or a polygon encoded in Geobuf format. Including multiple selections will return a validation error.</p> <note> <p>The <a href=\"https://docs.aws.amazon.com/location-geofences/latest/APIReference/API_GeofenceGeometry.html\"> geofence polygon</a> format supports a maximum of 1,000 vertices. The <a href=\"https://docs.aws.amazon.com/location-geofences/latest/APIReference/API_GeofenceGeometry.html\">Geofence geobuf</a> format supports a maximum of 100,000 vertices.</p> </note>" + }, "GeofenceProperties":{ "shape":"PropertyMap", "documentation":"<p>Associates one of more properties with the geofence. A property is a key-value pair stored with the geofence and added to any geofence event triggered with that geofence.</p> <p>Format: <code>\"key\" : \"value\"</code> </p>" - }, - "Geometry":{ - "shape":"GeofenceGeometry", - "documentation":"<p>Contains the details of the position of the geofence. Can be either a polygon or a circle. Including both will return a validation error.</p> <note> <p>Each <a href=\"https://docs.aws.amazon.com/location-geofences/latest/APIReference/API_GeofenceGeometry.html\"> geofence polygon</a> can have a maximum of 1,000 vertices.</p> </note>" } }, "documentation":"<p>Contains geofence geometry details. </p>" @@ -1588,36 +1632,36 @@ "BatchPutGeofenceResponse":{ "type":"structure", "required":[ - "Errors", - "Successes" + "Successes", + "Errors" ], "members":{ - "Errors":{ - "shape":"BatchPutGeofenceErrorList", - "documentation":"<p>Contains additional error details for each geofence that failed to be stored in a geofence collection.</p>" - }, "Successes":{ "shape":"BatchPutGeofenceSuccessList", "documentation":"<p>Contains each geofence that was successfully stored in a geofence collection.</p>" + }, + "Errors":{ + "shape":"BatchPutGeofenceErrorList", + "documentation":"<p>Contains additional error details for each geofence that failed to be stored in a geofence collection.</p>" } } }, "BatchPutGeofenceSuccess":{ "type":"structure", "required":[ - "CreateTime", "GeofenceId", + "CreateTime", "UpdateTime" ], "members":{ - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the geofence was stored in a geofence collection in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" - }, "GeofenceId":{ "shape":"Id", "documentation":"<p>The geofence successfully stored in a geofence collection.</p>" }, + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the geofence was stored in a geofence collection in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" + }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the geofence was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" @@ -1633,21 +1677,21 @@ "type":"structure", "required":[ "DeviceId", - "Error", - "SampleTime" + "SampleTime", + "Error" ], "members":{ "DeviceId":{ "shape":"Id", "documentation":"<p>The device associated with the failed location update.</p>" }, - "Error":{ - "shape":"BatchItemError", - "documentation":"<p>Contains details related to the error code such as the error code and error message.</p>" - }, "SampleTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp at which the device position was determined. Uses <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + }, + "Error":{ + "shape":"BatchItemError", + "documentation":"<p>Contains details related to the error code such as the error code and error message.</p>" } }, "documentation":"<p>Contains error details for each device that failed to update its position.</p>" @@ -1731,43 +1775,43 @@ "location":"uri", "locationName":"CalculatorName" }, - "CarModeOptions":{ - "shape":"CalculateRouteCarModeOptions", - "documentation":"<p>Specifies route preferences when traveling by <code>Car</code>, such as avoiding routes that use ferries or tolls.</p> <p>Requirements: <code>TravelMode</code> must be specified as <code>Car</code>.</p>" - }, - "DepartNow":{ - "shape":"Boolean", - "documentation":"<p>Sets the time of departure as the current time. Uses the current time to calculate the route matrix. You can't set both <code>DepartureTime</code> and <code>DepartNow</code>. If neither is set, the best time of day to travel with the best traffic conditions is used to calculate the route matrix.</p> <p>Default Value: <code>false</code> </p> <p>Valid Values: <code>false</code> | <code>true</code> </p>" - }, "DeparturePositions":{ "shape":"CalculateRouteMatrixRequestDeparturePositionsList", "documentation":"<p>The list of departure (origin) positions for the route matrix. An array of points, each of which is itself a 2-value array defined in <a href=\"https://earth-info.nga.mil/GandG/wgs84/index.html\">WGS 84</a> format: <code>[longitude, latitude]</code>. For example, <code>[-123.115, 49.285]</code>.</p> <important> <p>Depending on the data provider selected in the route calculator resource there may be additional restrictions on the inputs you can choose. See <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/calculate-route-matrix.html#matrix-routing-position-limits\"> Position restrictions</a> in the <i>Amazon Location Service Developer Guide</i>.</p> </important> <note> <p>For route calculators that use Esri as the data provider, if you specify a departure that's not located on a road, Amazon Location <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/snap-to-nearby-road.html\"> moves the position to the nearest road</a>. The snapped value is available in the result in <code>SnappedDeparturePositions</code>.</p> </note> <p>Valid Values: <code>[-180 to 180,-90 to 90]</code> </p>" }, + "DestinationPositions":{ + "shape":"CalculateRouteMatrixRequestDestinationPositionsList", + "documentation":"<p>The list of destination positions for the route matrix. An array of points, each of which is itself a 2-value array defined in <a href=\"https://earth-info.nga.mil/GandG/wgs84/index.html\">WGS 84</a> format: <code>[longitude, latitude]</code>. For example, <code>[-122.339, 47.615]</code> </p> <important> <p>Depending on the data provider selected in the route calculator resource there may be additional restrictions on the inputs you can choose. See <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/calculate-route-matrix.html#matrix-routing-position-limits\"> Position restrictions</a> in the <i>Amazon Location Service Developer Guide</i>.</p> </important> <note> <p>For route calculators that use Esri as the data provider, if you specify a destination that's not located on a road, Amazon Location <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/snap-to-nearby-road.html\"> moves the position to the nearest road</a>. The snapped value is available in the result in <code>SnappedDestinationPositions</code>.</p> </note> <p>Valid Values: <code>[-180 to 180,-90 to 90]</code> </p>" + }, + "TravelMode":{ + "shape":"TravelMode", + "documentation":"<p>Specifies the mode of transport when calculating a route. Used in estimating the speed of travel and road compatibility.</p> <p>The <code>TravelMode</code> you specify also determines how you specify route preferences: </p> <ul> <li> <p>If traveling by <code>Car</code> use the <code>CarModeOptions</code> parameter.</p> </li> <li> <p>If traveling by <code>Truck</code> use the <code>TruckModeOptions</code> parameter.</p> </li> </ul> <note> <p> <code>Bicycle</code> or <code>Motorcycle</code> are only valid when using <code>Grab</code> as a data provider, and only within Southeast Asia.</p> <p> <code>Truck</code> is not available for Grab.</p> <p>For more information about using Grab as a data provider, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html\">GrabMaps</a> in the <i>Amazon Location Service Developer Guide</i>.</p> </note> <p>Default Value: <code>Car</code> </p>" + }, "DepartureTime":{ "shape":"Timestamp", "documentation":"<p>Specifies the desired time of departure. Uses the given time to calculate the route matrix. You can't set both <code>DepartureTime</code> and <code>DepartNow</code>. If neither is set, the best time of day to travel with the best traffic conditions is used to calculate the route matrix.</p> <note> <p>Setting a departure time in the past returns a <code>400 ValidationException</code> error.</p> </note> <ul> <li> <p>In <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. For example, <code>2020–07-2T12:15:20.000Z+01:00</code> </p> </li> </ul>" }, - "DestinationPositions":{ - "shape":"CalculateRouteMatrixRequestDestinationPositionsList", - "documentation":"<p>The list of destination positions for the route matrix. An array of points, each of which is itself a 2-value array defined in <a href=\"https://earth-info.nga.mil/GandG/wgs84/index.html\">WGS 84</a> format: <code>[longitude, latitude]</code>. For example, <code>[-122.339, 47.615]</code> </p> <important> <p>Depending on the data provider selected in the route calculator resource there may be additional restrictions on the inputs you can choose. See <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/calculate-route-matrix.html#matrix-routing-position-limits\"> Position restrictions</a> in the <i>Amazon Location Service Developer Guide</i>.</p> </important> <note> <p>For route calculators that use Esri as the data provider, if you specify a destination that's not located on a road, Amazon Location <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/snap-to-nearby-road.html\"> moves the position to the nearest road</a>. The snapped value is available in the result in <code>SnappedDestinationPositions</code>.</p> </note> <p>Valid Values: <code>[-180 to 180,-90 to 90]</code> </p>" + "DepartNow":{ + "shape":"Boolean", + "documentation":"<p>Sets the time of departure as the current time. Uses the current time to calculate the route matrix. You can't set both <code>DepartureTime</code> and <code>DepartNow</code>. If neither is set, the best time of day to travel with the best traffic conditions is used to calculate the route matrix.</p> <p>Default Value: <code>false</code> </p> <p>Valid Values: <code>false</code> | <code>true</code> </p>" }, "DistanceUnit":{ "shape":"DistanceUnit", "documentation":"<p>Set the unit system to specify the distance.</p> <p>Default Value: <code>Kilometers</code> </p>" }, + "CarModeOptions":{ + "shape":"CalculateRouteCarModeOptions", + "documentation":"<p>Specifies route preferences when traveling by <code>Car</code>, such as avoiding routes that use ferries or tolls.</p> <p>Requirements: <code>TravelMode</code> must be specified as <code>Car</code>.</p>" + }, + "TruckModeOptions":{ + "shape":"CalculateRouteTruckModeOptions", + "documentation":"<p>Specifies route preferences when traveling by <code>Truck</code>, such as avoiding routes that use ferries or tolls, and truck specifications to consider when choosing an optimal road.</p> <p>Requirements: <code>TravelMode</code> must be specified as <code>Truck</code>.</p>" + }, "Key":{ "shape":"ApiKey", "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", "location":"querystring", "locationName":"key" - }, - "TravelMode":{ - "shape":"TravelMode", - "documentation":"<p>Specifies the mode of transport when calculating a route. Used in estimating the speed of travel and road compatibility.</p> <p>The <code>TravelMode</code> you specify also determines how you specify route preferences: </p> <ul> <li> <p>If traveling by <code>Car</code> use the <code>CarModeOptions</code> parameter.</p> </li> <li> <p>If traveling by <code>Truck</code> use the <code>TruckModeOptions</code> parameter.</p> </li> </ul> <note> <p> <code>Bicycle</code> or <code>Motorcycle</code> are only valid when using <code>Grab</code> as a data provider, and only within Southeast Asia.</p> <p> <code>Truck</code> is not available for Grab.</p> <p>For more information about using Grab as a data provider, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html\">GrabMaps</a> in the <i>Amazon Location Service Developer Guide</i>.</p> </note> <p>Default Value: <code>Car</code> </p>" - }, - "TruckModeOptions":{ - "shape":"CalculateRouteTruckModeOptions", - "documentation":"<p>Specifies route preferences when traveling by <code>Truck</code>, such as avoiding routes that use ferries or tolls, and truck specifications to consider when choosing an optimal road.</p> <p>Requirements: <code>TravelMode</code> must be specified as <code>Truck</code>.</p>" } } }, @@ -1825,26 +1869,26 @@ "type":"structure", "required":[ "DataSource", - "DistanceUnit", + "RouteCount", "ErrorCount", - "RouteCount" + "DistanceUnit" ], "members":{ "DataSource":{ "shape":"String", "documentation":"<p>The data provider of traffic and road network data used to calculate the routes. Indicates one of the available providers:</p> <ul> <li> <p> <code>Esri</code> </p> </li> <li> <p> <code>Grab</code> </p> </li> <li> <p> <code>Here</code> </p> </li> </ul> <p>For more information about data providers, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Amazon Location Service data providers</a>.</p>" }, - "DistanceUnit":{ - "shape":"DistanceUnit", - "documentation":"<p>The unit of measurement for route distances.</p>" + "RouteCount":{ + "shape":"CalculateRouteMatrixSummaryRouteCountInteger", + "documentation":"<p>The count of cells in the route matrix. Equal to the number of <code>DeparturePositions</code> multiplied by the number of <code>DestinationPositions</code>.</p>" }, "ErrorCount":{ "shape":"CalculateRouteMatrixSummaryErrorCountInteger", "documentation":"<p>The count of error results in the route matrix. If this number is 0, all routes were calculated successfully.</p>" }, - "RouteCount":{ - "shape":"CalculateRouteMatrixSummaryRouteCountInteger", - "documentation":"<p>The count of cells in the route matrix. Equal to the number of <code>DeparturePositions</code> multiplied by the number of <code>DestinationPositions</code>.</p>" + "DistanceUnit":{ + "shape":"DistanceUnit", + "documentation":"<p>The unit of measurement for route distances.</p>" } }, "documentation":"<p>A summary of the calculated route matrix.</p>" @@ -1869,35 +1913,35 @@ "DestinationPosition" ], "members":{ - "ArrivalTime":{ - "shape":"Timestamp", - "documentation":"<p>Specifies the desired time of arrival. Uses the given time to calculate the route. Otherwise, the best time of day to travel with the best traffic conditions is used to calculate the route.</p> <note> <p>ArrivalTime is not supported Esri.</p> </note>" - }, "CalculatorName":{ "shape":"ResourceName", "documentation":"<p>The name of the route calculator resource that you want to use to calculate the route. </p>", "location":"uri", "locationName":"CalculatorName" }, - "CarModeOptions":{ - "shape":"CalculateRouteCarModeOptions", - "documentation":"<p>Specifies route preferences when traveling by <code>Car</code>, such as avoiding routes that use ferries or tolls.</p> <p>Requirements: <code>TravelMode</code> must be specified as <code>Car</code>.</p>" - }, - "DepartNow":{ - "shape":"Boolean", - "documentation":"<p>Sets the time of departure as the current time. Uses the current time to calculate a route. Otherwise, the best time of day to travel with the best traffic conditions is used to calculate the route.</p> <p>Default Value: <code>false</code> </p> <p>Valid Values: <code>false</code> | <code>true</code> </p>" - }, "DeparturePosition":{ "shape":"Position", "documentation":"<p>The start position for the route. Defined in <a href=\"https://earth-info.nga.mil/index.php?dir=wgs84&action=wgs84\">World Geodetic System (WGS 84)</a> format: <code>[longitude, latitude]</code>.</p> <ul> <li> <p>For example, <code>[-123.115, 49.285]</code> </p> </li> </ul> <note> <p>If you specify a departure that's not located on a road, Amazon Location <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/snap-to-nearby-road.html\">moves the position to the nearest road</a>. If Esri is the provider for your route calculator, specifying a route that is longer than 400 km returns a <code>400 RoutesValidationException</code> error.</p> </note> <p>Valid Values: <code>[-180 to 180,-90 to 90]</code> </p>" }, + "DestinationPosition":{ + "shape":"Position", + "documentation":"<p>The finish position for the route. Defined in <a href=\"https://earth-info.nga.mil/index.php?dir=wgs84&action=wgs84\">World Geodetic System (WGS 84)</a> format: <code>[longitude, latitude]</code>.</p> <ul> <li> <p> For example, <code>[-122.339, 47.615]</code> </p> </li> </ul> <note> <p>If you specify a destination that's not located on a road, Amazon Location <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/snap-to-nearby-road.html\">moves the position to the nearest road</a>. </p> </note> <p>Valid Values: <code>[-180 to 180,-90 to 90]</code> </p>" + }, + "WaypointPositions":{ + "shape":"CalculateRouteRequestWaypointPositionsList", + "documentation":"<p>Specifies an ordered list of up to 23 intermediate positions to include along a route between the departure position and destination position. </p> <ul> <li> <p>For example, from the <code>DeparturePosition</code> <code>[-123.115, 49.285]</code>, the route follows the order that the waypoint positions are given <code>[[-122.757, 49.0021],[-122.349, 47.620]]</code> </p> </li> </ul> <note> <p>If you specify a waypoint position that's not located on a road, Amazon Location <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/snap-to-nearby-road.html\">moves the position to the nearest road</a>. </p> <p>Specifying more than 23 waypoints returns a <code>400 ValidationException</code> error.</p> <p>If Esri is the provider for your route calculator, specifying a route that is longer than 400 km returns a <code>400 RoutesValidationException</code> error.</p> </note> <p>Valid Values: <code>[-180 to 180,-90 to 90]</code> </p>" + }, + "TravelMode":{ + "shape":"TravelMode", + "documentation":"<p>Specifies the mode of transport when calculating a route. Used in estimating the speed of travel and road compatibility. You can choose <code>Car</code>, <code>Truck</code>, <code>Walking</code>, <code>Bicycle</code> or <code>Motorcycle</code> as options for the <code>TravelMode</code>.</p> <note> <p> <code>Bicycle</code> and <code>Motorcycle</code> are only valid when using Grab as a data provider, and only within Southeast Asia.</p> <p> <code>Truck</code> is not available for Grab.</p> <p>For more details on the using Grab for routing, including areas of coverage, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html\">GrabMaps</a> in the <i>Amazon Location Service Developer Guide</i>.</p> </note> <p>The <code>TravelMode</code> you specify also determines how you specify route preferences: </p> <ul> <li> <p>If traveling by <code>Car</code> use the <code>CarModeOptions</code> parameter.</p> </li> <li> <p>If traveling by <code>Truck</code> use the <code>TruckModeOptions</code> parameter.</p> </li> </ul> <p>Default Value: <code>Car</code> </p>" + }, "DepartureTime":{ "shape":"Timestamp", "documentation":"<p>Specifies the desired time of departure. Uses the given time to calculate the route. Otherwise, the best time of day to travel with the best traffic conditions is used to calculate the route.</p> <ul> <li> <p>In <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. For example, <code>2020–07-2T12:15:20.000Z+01:00</code> </p> </li> </ul>" }, - "DestinationPosition":{ - "shape":"Position", - "documentation":"<p>The finish position for the route. Defined in <a href=\"https://earth-info.nga.mil/index.php?dir=wgs84&action=wgs84\">World Geodetic System (WGS 84)</a> format: <code>[longitude, latitude]</code>.</p> <ul> <li> <p> For example, <code>[-122.339, 47.615]</code> </p> </li> </ul> <note> <p>If you specify a destination that's not located on a road, Amazon Location <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/snap-to-nearby-road.html\">moves the position to the nearest road</a>. </p> </note> <p>Valid Values: <code>[-180 to 180,-90 to 90]</code> </p>" + "DepartNow":{ + "shape":"Boolean", + "documentation":"<p>Sets the time of departure as the current time. Uses the current time to calculate a route. Otherwise, the best time of day to travel with the best traffic conditions is used to calculate the route.</p> <p>Default Value: <code>false</code> </p> <p>Valid Values: <code>false</code> | <code>true</code> </p>" }, "DistanceUnit":{ "shape":"DistanceUnit", @@ -1907,27 +1951,27 @@ "shape":"Boolean", "documentation":"<p>Set to include the geometry details in the result for each path between a pair of positions.</p> <p>Default Value: <code>false</code> </p> <p>Valid Values: <code>false</code> | <code>true</code> </p>" }, - "Key":{ - "shape":"ApiKey", - "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", - "location":"querystring", - "locationName":"key" - }, - "OptimizeFor":{ - "shape":"OptimizationMode", - "documentation":"<p>Specifies the distance to optimize for when calculating a route.</p>" - }, - "TravelMode":{ - "shape":"TravelMode", - "documentation":"<p>Specifies the mode of transport when calculating a route. Used in estimating the speed of travel and road compatibility. You can choose <code>Car</code>, <code>Truck</code>, <code>Walking</code>, <code>Bicycle</code> or <code>Motorcycle</code> as options for the <code>TravelMode</code>.</p> <note> <p> <code>Bicycle</code> and <code>Motorcycle</code> are only valid when using Grab as a data provider, and only within Southeast Asia.</p> <p> <code>Truck</code> is not available for Grab.</p> <p>For more details on the using Grab for routing, including areas of coverage, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html\">GrabMaps</a> in the <i>Amazon Location Service Developer Guide</i>.</p> </note> <p>The <code>TravelMode</code> you specify also determines how you specify route preferences: </p> <ul> <li> <p>If traveling by <code>Car</code> use the <code>CarModeOptions</code> parameter.</p> </li> <li> <p>If traveling by <code>Truck</code> use the <code>TruckModeOptions</code> parameter.</p> </li> </ul> <p>Default Value: <code>Car</code> </p>" + "CarModeOptions":{ + "shape":"CalculateRouteCarModeOptions", + "documentation":"<p>Specifies route preferences when traveling by <code>Car</code>, such as avoiding routes that use ferries or tolls.</p> <p>Requirements: <code>TravelMode</code> must be specified as <code>Car</code>.</p>" }, "TruckModeOptions":{ "shape":"CalculateRouteTruckModeOptions", "documentation":"<p>Specifies route preferences when traveling by <code>Truck</code>, such as avoiding routes that use ferries or tolls, and truck specifications to consider when choosing an optimal road.</p> <p>Requirements: <code>TravelMode</code> must be specified as <code>Truck</code>.</p>" }, - "WaypointPositions":{ - "shape":"CalculateRouteRequestWaypointPositionsList", - "documentation":"<p>Specifies an ordered list of up to 23 intermediate positions to include along a route between the departure position and destination position. </p> <ul> <li> <p>For example, from the <code>DeparturePosition</code> <code>[-123.115, 49.285]</code>, the route follows the order that the waypoint positions are given <code>[[-122.757, 49.0021],[-122.349, 47.620]]</code> </p> </li> </ul> <note> <p>If you specify a waypoint position that's not located on a road, Amazon Location <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/snap-to-nearby-road.html\">moves the position to the nearest road</a>. </p> <p>Specifying more than 23 waypoints returns a <code>400 ValidationException</code> error.</p> <p>If Esri is the provider for your route calculator, specifying a route that is longer than 400 km returns a <code>400 RoutesValidationException</code> error.</p> </note> <p>Valid Values: <code>[-180 to 180,-90 to 90]</code> </p>" + "ArrivalTime":{ + "shape":"Timestamp", + "documentation":"<p>Specifies the desired time of arrival. Uses the given time to calculate the route. Otherwise, the best time of day to travel with the best traffic conditions is used to calculate the route.</p> <note> <p>ArrivalTime is not supported Esri.</p> </note>" + }, + "OptimizeFor":{ + "shape":"OptimizationMode", + "documentation":"<p>Specifies the distance to optimize for when calculating a route.</p>" + }, + "Key":{ + "shape":"ApiKey", + "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", + "location":"querystring", + "locationName":"key" } } }, @@ -1958,32 +2002,32 @@ "CalculateRouteSummary":{ "type":"structure", "required":[ + "RouteBBox", "DataSource", "Distance", - "DistanceUnit", "DurationSeconds", - "RouteBBox" + "DistanceUnit" ], "members":{ - "DataSource":{ - "shape":"String", + "RouteBBox":{ + "shape":"BoundingBox", + "documentation":"<p>Specifies a geographical box surrounding a route. Used to zoom into a route when displaying it in a map. For example, <code>[min x, min y, max x, max y]</code>.</p> <p>The first 2 <code>bbox</code> parameters describe the lower southwest corner: </p> <ul> <li> <p>The first <code>bbox</code> position is the X coordinate or longitude of the lower southwest corner. </p> </li> <li> <p>The second <code>bbox</code> position is the Y coordinate or latitude of the lower southwest corner. </p> </li> </ul> <p>The next 2 <code>bbox</code> parameters describe the upper northeast corner: </p> <ul> <li> <p>The third <code>bbox</code> position is the X coordinate, or longitude of the upper northeast corner. </p> </li> <li> <p>The fourth <code>bbox</code> position is the Y coordinate, or latitude of the upper northeast corner. </p> </li> </ul>" + }, + "DataSource":{ + "shape":"String", "documentation":"<p>The data provider of traffic and road network data used to calculate the route. Indicates one of the available providers:</p> <ul> <li> <p> <code>Esri</code> </p> </li> <li> <p> <code>Grab</code> </p> </li> <li> <p> <code>Here</code> </p> </li> </ul> <p>For more information about data providers, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Amazon Location Service data providers</a>.</p>" }, "Distance":{ "shape":"CalculateRouteSummaryDistanceDouble", "documentation":"<p>The total distance covered by the route. The sum of the distance travelled between every stop on the route.</p> <note> <p>If Esri is the data source for the route calculator, the route distance can’t be greater than 400 km. If the route exceeds 400 km, the response is a <code>400 RoutesValidationException</code> error.</p> </note>" }, - "DistanceUnit":{ - "shape":"DistanceUnit", - "documentation":"<p>The unit of measurement for route distances.</p>" - }, "DurationSeconds":{ "shape":"CalculateRouteSummaryDurationSecondsDouble", "documentation":"<p>The total travel time for the route measured in seconds. The sum of the travel time between every stop on the route.</p>" }, - "RouteBBox":{ - "shape":"BoundingBox", - "documentation":"<p>Specifies a geographical box surrounding a route. Used to zoom into a route when displaying it in a map. For example, <code>[min x, min y, max x, max y]</code>.</p> <p>The first 2 <code>bbox</code> parameters describe the lower southwest corner: </p> <ul> <li> <p>The first <code>bbox</code> position is the X coordinate or longitude of the lower southwest corner. </p> </li> <li> <p>The second <code>bbox</code> position is the Y coordinate or latitude of the lower southwest corner. </p> </li> </ul> <p>The next 2 <code>bbox</code> parameters describe the upper northeast corner: </p> <ul> <li> <p>The third <code>bbox</code> position is the X coordinate, or longitude of the upper northeast corner. </p> </li> <li> <p>The fourth <code>bbox</code> position is the Y coordinate, or latitude of the upper northeast corner. </p> </li> </ul>" + "DistanceUnit":{ + "shape":"DistanceUnit", + "documentation":"<p>The unit of measurement for route distances.</p>" } }, "documentation":"<p>A summary of the calculated route.</p>" @@ -2020,6 +2064,23 @@ }, "documentation":"<p>Contains details about additional route preferences for requests that specify <code>TravelMode</code> as <code>Truck</code>.</p>" }, + "CellSignals":{ + "type":"structure", + "required":["LteCellDetails"], + "members":{ + "LteCellDetails":{ + "shape":"CellSignalsLteCellDetailsList", + "documentation":"<p>Information about the Long-Term Evolution (LTE) network the device is connected to.</p>" + } + }, + "documentation":"<p>The cellular network communication infrastructure that the device uses.</p>" + }, + "CellSignalsLteCellDetailsList":{ + "type":"list", + "member":{"shape":"LteCellDetails"}, + "max":16, + "min":1 + }, "Circle":{ "type":"structure", "required":[ @@ -2055,25 +2116,21 @@ }, "exception":true }, - "CountryCode":{ - "type":"string", - "pattern":"^[A-Z]{3}$" - }, "CountryCode3":{ "type":"string", "max":3, "min":3, - "pattern":"^[A-Z]{3}$" + "pattern":"[A-Z]{3}" }, "CountryCode3OrEmpty":{ "type":"string", "max":3, "min":0, - "pattern":"^[A-Z]{3}$|^$" + "pattern":"[A-Z]{3}$|^" }, "CountryCodeList":{ "type":"list", - "member":{"shape":"CountryCode"}, + "member":{"shape":"CountryCode3"}, "max":100, "min":1 }, @@ -2085,14 +2142,6 @@ "shape":"ResourceName", "documentation":"<p>A custom name for the geofence collection.</p> <p>Requirements:</p> <ul> <li> <p>Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens (-), periods (.), and underscores (_). </p> </li> <li> <p>Must be a unique geofence collection name.</p> </li> <li> <p>No spaces allowed. For example, <code>ExampleGeofenceCollection</code>.</p> </li> </ul>" }, - "Description":{ - "shape":"ResourceDescription", - "documentation":"<p>An optional description for the geofence collection.</p>" - }, - "KmsKeyId":{ - "shape":"KmsKeyId", - "documentation":"<p>A key identifier for an <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html\">Amazon Web Services KMS customer managed key</a>. Enter a key ID, key ARN, alias name, or alias ARN. </p>" - }, "PricingPlan":{ "shape":"PricingPlan", "documentation":"<p>No longer used. If included, the only allowed value is <code>RequestBasedUsage</code>.</p>", @@ -2105,28 +2154,36 @@ "deprecated":true, "deprecatedMessage":"Deprecated. No longer allowed." }, + "Description":{ + "shape":"ResourceDescription", + "documentation":"<p>An optional description for the geofence collection.</p>" + }, "Tags":{ "shape":"TagMap", "documentation":"<p>Applies one or more tags to the geofence collection. A tag is a key-value pair helps manage, identify, search, and filter your resources by labelling them.</p> <p>Format: <code>\"key\" : \"value\"</code> </p> <p>Restrictions:</p> <ul> <li> <p>Maximum 50 tags per resource</p> </li> <li> <p>Each resource tag must be unique with a maximum of one value.</p> </li> <li> <p>Maximum key length: 128 Unicode characters in UTF-8</p> </li> <li> <p>Maximum value length: 256 Unicode characters in UTF-8</p> </li> <li> <p>Can use alphanumeric characters (A–Z, a–z, 0–9), and the following characters: + - = . _ : / @. </p> </li> <li> <p>Cannot use \"aws:\" as a prefix for a key.</p> </li> </ul>" + }, + "KmsKeyId":{ + "shape":"KmsKeyId", + "documentation":"<p>A key identifier for an <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html\">Amazon Web Services KMS customer managed key</a>. Enter a key ID, key ARN, alias name, or alias ARN. </p>" } } }, "CreateGeofenceCollectionResponse":{ "type":"structure", "required":[ - "CollectionArn", "CollectionName", + "CollectionArn", "CreateTime" ], "members":{ - "CollectionArn":{ - "shape":"Arn", - "documentation":"<p>The Amazon Resource Name (ARN) for the geofence collection resource. Used when you need to specify a resource across all Amazon Web Services. </p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:geofence-collection/ExampleGeofenceCollection</code> </p> </li> </ul>" - }, "CollectionName":{ "shape":"ResourceName", "documentation":"<p>The name for the geofence collection.</p>" }, + "CollectionArn":{ + "shape":"Arn", + "documentation":"<p>The Amazon Resource Name (ARN) for the geofence collection resource. Used when you need to specify a resource across all Amazon Web Services. </p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:geofence-collection/ExampleGeofenceCollection</code> </p> </li> </ul>" + }, "CreateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the geofence collection was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" @@ -2140,6 +2197,14 @@ "Restrictions" ], "members":{ + "KeyName":{ + "shape":"ResourceName", + "documentation":"<p>A custom name for the API key resource.</p> <p>Requirements:</p> <ul> <li> <p>Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens (-), periods (.), and underscores (_). </p> </li> <li> <p>Must be a unique API key name.</p> </li> <li> <p>No spaces allowed. For example, <code>ExampleAPIKey</code>.</p> </li> </ul>" + }, + "Restrictions":{ + "shape":"ApiKeyRestrictions", + "documentation":"<p>The API key restrictions for the API key resource.</p>" + }, "Description":{ "shape":"ResourceDescription", "documentation":"<p>An optional description for the API key resource.</p>" @@ -2148,18 +2213,10 @@ "shape":"Timestamp", "documentation":"<p>The optional timestamp for when the API key resource will expire in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. One of <code>NoExpiry</code> or <code>ExpireTime</code> must be set.</p>" }, - "KeyName":{ - "shape":"ResourceName", - "documentation":"<p>A custom name for the API key resource.</p> <p>Requirements:</p> <ul> <li> <p>Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens (-), periods (.), and underscores (_). </p> </li> <li> <p>Must be a unique API key name.</p> </li> <li> <p>No spaces allowed. For example, <code>ExampleAPIKey</code>.</p> </li> </ul>" - }, "NoExpiry":{ "shape":"Boolean", "documentation":"<p>Optionally set to <code>true</code> to set no expiration time for the API key. One of <code>NoExpiry</code> or <code>ExpireTime</code> must be set.</p>" }, - "Restrictions":{ - "shape":"ApiKeyRestrictions", - "documentation":"<p>The API key restrictions for the API key resource.</p>" - }, "Tags":{ "shape":"TagMap", "documentation":"<p>Applies one or more tags to the map resource. A tag is a key-value pair that helps manage, identify, search, and filter your resources by labelling them.</p> <p>Format: <code>\"key\" : \"value\"</code> </p> <p>Restrictions:</p> <ul> <li> <p>Maximum 50 tags per resource</p> </li> <li> <p>Each resource tag must be unique with a maximum of one value.</p> </li> <li> <p>Maximum key length: 128 Unicode characters in UTF-8</p> </li> <li> <p>Maximum value length: 256 Unicode characters in UTF-8</p> </li> <li> <p>Can use alphanumeric characters (A–Z, a–z, 0–9), and the following characters: + - = . _ : / @. </p> </li> <li> <p>Cannot use \"aws:\" as a prefix for a key.</p> </li> </ul>" @@ -2169,16 +2226,12 @@ "CreateKeyResponse":{ "type":"structure", "required":[ - "CreateTime", "Key", "KeyArn", - "KeyName" + "KeyName", + "CreateTime" ], "members":{ - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the API key resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" - }, "Key":{ "shape":"ApiKey", "documentation":"<p>The key value/string of an API key. This value is used when making API calls to authorize the call. For example, see <a href=\"https://docs.aws.amazon.com/location/latest/APIReference/API_GetMapGlyphs.html\">GetMapGlyphs</a>.</p>" @@ -2190,34 +2243,38 @@ "KeyName":{ "shape":"ResourceName", "documentation":"<p>The name of the API key resource.</p>" + }, + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the API key resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" } } }, "CreateMapRequest":{ "type":"structure", "required":[ - "Configuration", - "MapName" + "MapName", + "Configuration" ], "members":{ - "Configuration":{ - "shape":"MapConfiguration", - "documentation":"<p>Specifies the <code>MapConfiguration</code>, including the map style, for the map resource that you create. The map style defines the look of maps and the data provider for your map resource.</p>" - }, - "Description":{ - "shape":"ResourceDescription", - "documentation":"<p>An optional description for the map resource.</p>" - }, "MapName":{ "shape":"ResourceName", "documentation":"<p>The name for the map resource.</p> <p>Requirements:</p> <ul> <li> <p>Must contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens (-), periods (.), and underscores (_). </p> </li> <li> <p>Must be a unique map resource name. </p> </li> <li> <p>No spaces allowed. For example, <code>ExampleMap</code>.</p> </li> </ul>" }, + "Configuration":{ + "shape":"MapConfiguration", + "documentation":"<p>Specifies the <code>MapConfiguration</code>, including the map style, for the map resource that you create. The map style defines the look of maps and the data provider for your map resource.</p>" + }, "PricingPlan":{ "shape":"PricingPlan", "documentation":"<p>No longer used. If included, the only allowed value is <code>RequestBasedUsage</code>.</p>", "deprecated":true, "deprecatedMessage":"Deprecated. If included, the only allowed value is RequestBasedUsage." }, + "Description":{ + "shape":"ResourceDescription", + "documentation":"<p>An optional description for the map resource.</p>" + }, "Tags":{ "shape":"TagMap", "documentation":"<p>Applies one or more tags to the map resource. A tag is a key-value pair helps manage, identify, search, and filter your resources by labelling them.</p> <p>Format: <code>\"key\" : \"value\"</code> </p> <p>Restrictions:</p> <ul> <li> <p>Maximum 50 tags per resource</p> </li> <li> <p>Each resource tag must be unique with a maximum of one value.</p> </li> <li> <p>Maximum key length: 128 Unicode characters in UTF-8</p> </li> <li> <p>Maximum value length: 256 Unicode characters in UTF-8</p> </li> <li> <p>Can use alphanumeric characters (A–Z, a–z, 0–9), and the following characters: + - = . _ : / @. </p> </li> <li> <p>Cannot use \"aws:\" as a prefix for a key.</p> </li> </ul>" @@ -2227,54 +2284,54 @@ "CreateMapResponse":{ "type":"structure", "required":[ - "CreateTime", + "MapName", "MapArn", - "MapName" + "CreateTime" ], "members":{ - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the map resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>.</p>" + "MapName":{ + "shape":"ResourceName", + "documentation":"<p>The name of the map resource.</p>" }, "MapArn":{ "shape":"GeoArn", "documentation":"<p>The Amazon Resource Name (ARN) for the map resource. Used to specify a resource across all Amazon Web Services.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:map/ExampleMap</code> </p> </li> </ul>" }, - "MapName":{ - "shape":"ResourceName", - "documentation":"<p>The name of the map resource.</p>" + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the map resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>.</p>" } } }, "CreatePlaceIndexRequest":{ "type":"structure", "required":[ - "DataSource", - "IndexName" + "IndexName", + "DataSource" ], "members":{ - "DataSource":{ - "shape":"String", - "documentation":"<p>Specifies the geospatial data provider for the new place index.</p> <note> <p>This field is case-sensitive. Enter the valid values as shown. For example, entering <code>HERE</code> returns an error.</p> </note> <p>Valid values include:</p> <ul> <li> <p> <code>Esri</code> – For additional information about <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/esri.html\">Esri</a>'s coverage in your region of interest, see <a href=\"https://developers.arcgis.com/rest/geocode/api-reference/geocode-coverage.htm\">Esri details on geocoding coverage</a>.</p> </li> <li> <p> <code>Grab</code> – Grab provides place index functionality for Southeast Asia. For additional information about <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html\">GrabMaps</a>' coverage, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html#grab-coverage-area\">GrabMaps countries and areas covered</a>.</p> </li> <li> <p> <code>Here</code> – For additional information about <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/HERE.html\">HERE Technologies</a>' coverage in your region of interest, see <a href=\"https://developer.here.com/documentation/geocoder/dev_guide/topics/coverage-geocoder.html\">HERE details on goecoding coverage</a>.</p> <important> <p>If you specify HERE Technologies (<code>Here</code>) as the data provider, you may not <a href=\"https://docs.aws.amazon.com/location-places/latest/APIReference/API_DataSourceConfiguration.html\">store results</a> for locations in Japan. For more information, see the <a href=\"http://aws.amazon.com/service-terms/\">Amazon Web Services Service Terms</a> for Amazon Location Service.</p> </important> </li> </ul> <p>For additional information , see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Data providers</a> on the <i>Amazon Location Service Developer Guide</i>.</p>" - }, - "DataSourceConfiguration":{ - "shape":"DataSourceConfiguration", - "documentation":"<p>Specifies the data storage option requesting Places.</p>" - }, - "Description":{ - "shape":"ResourceDescription", - "documentation":"<p>The optional description for the place index resource.</p>" - }, "IndexName":{ "shape":"ResourceName", "documentation":"<p>The name of the place index resource. </p> <p>Requirements:</p> <ul> <li> <p>Contain only alphanumeric characters (A–Z, a–z, 0–9), hyphens (-), periods (.), and underscores (_).</p> </li> <li> <p>Must be a unique place index resource name.</p> </li> <li> <p>No spaces allowed. For example, <code>ExamplePlaceIndex</code>.</p> </li> </ul>" }, + "DataSource":{ + "shape":"String", + "documentation":"<p>Specifies the geospatial data provider for the new place index.</p> <note> <p>This field is case-sensitive. Enter the valid values as shown. For example, entering <code>HERE</code> returns an error.</p> </note> <p>Valid values include:</p> <ul> <li> <p> <code>Esri</code> – For additional information about <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/esri.html\">Esri</a>'s coverage in your region of interest, see <a href=\"https://developers.arcgis.com/rest/geocode/api-reference/geocode-coverage.htm\">Esri details on geocoding coverage</a>.</p> </li> <li> <p> <code>Grab</code> – Grab provides place index functionality for Southeast Asia. For additional information about <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html\">GrabMaps</a>' coverage, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html#grab-coverage-area\">GrabMaps countries and areas covered</a>.</p> </li> <li> <p> <code>Here</code> – For additional information about <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/HERE.html\">HERE Technologies</a>' coverage in your region of interest, see <a href=\"https://developer.here.com/documentation/geocoder/dev_guide/topics/coverage-geocoder.html\">HERE details on goecoding coverage</a>.</p> <important> <p>If you specify HERE Technologies (<code>Here</code>) as the data provider, you may not <a href=\"https://docs.aws.amazon.com/location-places/latest/APIReference/API_DataSourceConfiguration.html\">store results</a> for locations in Japan. For more information, see the <a href=\"http://aws.amazon.com/service-terms/\">Amazon Web Services Service Terms</a> for Amazon Location Service.</p> </important> </li> </ul> <p>For additional information , see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Data providers</a> on the <i>Amazon Location Service Developer Guide</i>.</p>" + }, "PricingPlan":{ "shape":"PricingPlan", "documentation":"<p>No longer used. If included, the only allowed value is <code>RequestBasedUsage</code>.</p>", "deprecated":true, "deprecatedMessage":"Deprecated. If included, the only allowed value is RequestBasedUsage." }, + "Description":{ + "shape":"ResourceDescription", + "documentation":"<p>The optional description for the place index resource.</p>" + }, + "DataSourceConfiguration":{ + "shape":"DataSourceConfiguration", + "documentation":"<p>Specifies the data storage option requesting Places.</p>" + }, "Tags":{ "shape":"TagMap", "documentation":"<p>Applies one or more tags to the place index resource. A tag is a key-value pair that helps you manage, identify, search, and filter your resources.</p> <p>Format: <code>\"key\" : \"value\"</code> </p> <p>Restrictions:</p> <ul> <li> <p>Maximum 50 tags per resource.</p> </li> <li> <p>Each tag key must be unique and must have exactly one associated value.</p> </li> <li> <p>Maximum key length: 128 Unicode characters in UTF-8.</p> </li> <li> <p>Maximum value length: 256 Unicode characters in UTF-8.</p> </li> <li> <p>Can use alphanumeric characters (A–Z, a–z, 0–9), and the following characters: + - = . _ : / @</p> </li> <li> <p>Cannot use \"aws:\" as a prefix for a key.</p> </li> </ul>" @@ -2284,22 +2341,22 @@ "CreatePlaceIndexResponse":{ "type":"structure", "required":[ - "CreateTime", + "IndexName", "IndexArn", - "IndexName" + "CreateTime" ], "members":{ - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the place index resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + "IndexName":{ + "shape":"ResourceName", + "documentation":"<p>The name for the place index resource.</p>" }, "IndexArn":{ "shape":"GeoArn", "documentation":"<p>The Amazon Resource Name (ARN) for the place index resource. Used to specify a resource across Amazon Web Services. </p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex</code> </p> </li> </ul>" }, - "IndexName":{ - "shape":"ResourceName", - "documentation":"<p>The name for the place index resource.</p>" + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the place index resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" } } }, @@ -2318,16 +2375,16 @@ "shape":"String", "documentation":"<p>Specifies the data provider of traffic and road network data.</p> <note> <p>This field is case-sensitive. Enter the valid values as shown. For example, entering <code>HERE</code> returns an error.</p> </note> <p>Valid values include:</p> <ul> <li> <p> <code>Esri</code> – For additional information about <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/esri.html\">Esri</a>'s coverage in your region of interest, see <a href=\"https://doc.arcgis.com/en/arcgis-online/reference/network-coverage.htm\">Esri details on street networks and traffic coverage</a>.</p> <p>Route calculators that use Esri as a data source only calculate routes that are shorter than 400 km.</p> </li> <li> <p> <code>Grab</code> – Grab provides routing functionality for Southeast Asia. For additional information about <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html\">GrabMaps</a>' coverage, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html#grab-coverage-area\">GrabMaps countries and areas covered</a>.</p> </li> <li> <p> <code>Here</code> – For additional information about <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/HERE.html\">HERE Technologies</a>' coverage in your region of interest, see <a href=\"https://developer.here.com/documentation/routing-api/dev_guide/topics/coverage/car-routing.html\">HERE car routing coverage</a> and <a href=\"https://developer.here.com/documentation/routing-api/dev_guide/topics/coverage/truck-routing.html\">HERE truck routing coverage</a>.</p> </li> </ul> <p>For additional information , see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Data providers</a> on the <i>Amazon Location Service Developer Guide</i>.</p>" }, - "Description":{ - "shape":"ResourceDescription", - "documentation":"<p>The optional description for the route calculator resource.</p>" - }, "PricingPlan":{ "shape":"PricingPlan", "documentation":"<p>No longer used. If included, the only allowed value is <code>RequestBasedUsage</code>.</p>", "deprecated":true, "deprecatedMessage":"Deprecated. If included, the only allowed value is RequestBasedUsage." }, + "Description":{ + "shape":"ResourceDescription", + "documentation":"<p>The optional description for the route calculator resource.</p>" + }, "Tags":{ "shape":"TagMap", "documentation":"<p>Applies one or more tags to the route calculator resource. A tag is a key-value pair helps manage, identify, search, and filter your resources by labelling them.</p> <ul> <li> <p>For example: { <code>\"tag1\" : \"value1\"</code>, <code>\"tag2\" : \"value2\"</code>}</p> </li> </ul> <p>Format: <code>\"key\" : \"value\"</code> </p> <p>Restrictions:</p> <ul> <li> <p>Maximum 50 tags per resource</p> </li> <li> <p>Each resource tag must be unique with a maximum of one value.</p> </li> <li> <p>Maximum key length: 128 Unicode characters in UTF-8</p> </li> <li> <p>Maximum value length: 256 Unicode characters in UTF-8</p> </li> <li> <p>Can use alphanumeric characters (A–Z, a–z, 0–9), and the following characters: + - = . _ : / @. </p> </li> <li> <p>Cannot use \"aws:\" as a prefix for a key.</p> </li> </ul>" @@ -2337,19 +2394,19 @@ "CreateRouteCalculatorResponse":{ "type":"structure", "required":[ - "CalculatorArn", "CalculatorName", + "CalculatorArn", "CreateTime" ], "members":{ - "CalculatorArn":{ - "shape":"GeoArn", - "documentation":"<p>The Amazon Resource Name (ARN) for the route calculator resource. Use the ARN when you specify a resource across all Amazon Web Services.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:route-calculator/ExampleCalculator</code> </p> </li> </ul>" - }, "CalculatorName":{ "shape":"ResourceName", "documentation":"<p>The name of the route calculator resource. </p> <ul> <li> <p>For example, <code>ExampleRouteCalculator</code>.</p> </li> </ul>" }, + "CalculatorArn":{ + "shape":"GeoArn", + "documentation":"<p>The Amazon Resource Name (ARN) for the route calculator resource. Use the ARN when you specify a resource across all Amazon Web Services.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:route-calculator/ExampleCalculator</code> </p> </li> </ul>" + }, "CreateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp when the route calculator resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p> <ul> <li> <p>For example, <code>2020–07-2T12:15:20.000Z+01:00</code> </p> </li> </ul>" @@ -2360,25 +2417,9 @@ "type":"structure", "required":["TrackerName"], "members":{ - "Description":{ - "shape":"ResourceDescription", - "documentation":"<p>An optional description for the tracker resource.</p>" - }, - "EventBridgeEnabled":{ - "shape":"Boolean", - "documentation":"<p>Whether to enable position <code>UPDATE</code> events from this tracker to be sent to EventBridge.</p> <note> <p>You do not need enable this feature to get <code>ENTER</code> and <code>EXIT</code> events for geofences with this tracker. Those events are always sent to EventBridge.</p> </note>" - }, - "KmsKeyEnableGeospatialQueries":{ - "shape":"Boolean", - "documentation":"<p>Enables <code>GeospatialQueries</code> for a tracker that uses a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html\">Amazon Web Services KMS customer managed key</a>.</p> <p>This parameter is only used if you are using a KMS customer managed key.</p> <note> <p>If you wish to encrypt your data using your own KMS customer managed key, then the Bounding Polygon Queries feature will be disabled by default. This is because by using this feature, a representation of your device positions will not be encrypted using the your KMS managed key. The exact device position, however; is still encrypted using your managed key.</p> <p>You can choose to opt-in to the Bounding Polygon Quseries feature. This is done by setting the <code>KmsKeyEnableGeospatialQueries</code> parameter to true when creating or updating a Tracker.</p> </note>" - }, - "KmsKeyId":{ - "shape":"KmsKeyId", - "documentation":"<p>A key identifier for an <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html\">Amazon Web Services KMS customer managed key</a>. Enter a key ID, key ARN, alias name, or alias ARN.</p>" - }, - "PositionFiltering":{ - "shape":"PositionFiltering", - "documentation":"<p>Specifies the position filtering for the tracker resource.</p> <p>Valid values:</p> <ul> <li> <p> <code>TimeBased</code> - Location updates are evaluated against linked geofence collections, but not every location update is stored. If your update frequency is more often than 30 seconds, only one update per 30 seconds is stored for each unique device ID. </p> </li> <li> <p> <code>DistanceBased</code> - If the device has moved less than 30 m (98.4 ft), location updates are ignored. Location updates within this area are neither evaluated against linked geofence collections, nor stored. This helps control costs by reducing the number of geofence evaluations and historical device positions to paginate through. Distance-based filtering can also reduce the effects of GPS noise when displaying device trajectories on a map. </p> </li> <li> <p> <code>AccuracyBased</code> - If the device has moved less than the measured accuracy, location updates are ignored. For example, if two consecutive updates from a device have a horizontal accuracy of 5 m and 10 m, the second update is ignored if the device has moved less than 15 m. Ignored location updates are neither evaluated against linked geofence collections, nor stored. This can reduce the effects of GPS noise when displaying device trajectories on a map, and can help control your costs by reducing the number of geofence evaluations. </p> </li> </ul> <p>This field is optional. If not specified, the default value is <code>TimeBased</code>.</p>" + "TrackerName":{ + "shape":"ResourceName", + "documentation":"<p>The name for the tracker resource.</p> <p>Requirements:</p> <ul> <li> <p>Contain only alphanumeric characters (A-Z, a-z, 0-9) , hyphens (-), periods (.), and underscores (_).</p> </li> <li> <p>Must be a unique tracker resource name.</p> </li> <li> <p>No spaces allowed. For example, <code>ExampleTracker</code>.</p> </li> </ul>" }, "PricingPlan":{ "shape":"PricingPlan", @@ -2386,41 +2427,57 @@ "deprecated":true, "deprecatedMessage":"Deprecated. If included, the only allowed value is RequestBasedUsage." }, + "KmsKeyId":{ + "shape":"KmsKeyId", + "documentation":"<p>A key identifier for an <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html\">Amazon Web Services KMS customer managed key</a>. Enter a key ID, key ARN, alias name, or alias ARN.</p>" + }, "PricingPlanDataSource":{ "shape":"String", "documentation":"<p>This parameter is no longer used.</p>", "deprecated":true, "deprecatedMessage":"Deprecated. No longer allowed." }, + "Description":{ + "shape":"ResourceDescription", + "documentation":"<p>An optional description for the tracker resource.</p>" + }, "Tags":{ "shape":"TagMap", "documentation":"<p>Applies one or more tags to the tracker resource. A tag is a key-value pair helps manage, identify, search, and filter your resources by labelling them.</p> <p>Format: <code>\"key\" : \"value\"</code> </p> <p>Restrictions:</p> <ul> <li> <p>Maximum 50 tags per resource</p> </li> <li> <p>Each resource tag must be unique with a maximum of one value.</p> </li> <li> <p>Maximum key length: 128 Unicode characters in UTF-8</p> </li> <li> <p>Maximum value length: 256 Unicode characters in UTF-8</p> </li> <li> <p>Can use alphanumeric characters (A–Z, a–z, 0–9), and the following characters: + - = . _ : / @. </p> </li> <li> <p>Cannot use \"aws:\" as a prefix for a key.</p> </li> </ul>" }, - "TrackerName":{ - "shape":"ResourceName", - "documentation":"<p>The name for the tracker resource.</p> <p>Requirements:</p> <ul> <li> <p>Contain only alphanumeric characters (A-Z, a-z, 0-9) , hyphens (-), periods (.), and underscores (_).</p> </li> <li> <p>Must be a unique tracker resource name.</p> </li> <li> <p>No spaces allowed. For example, <code>ExampleTracker</code>.</p> </li> </ul>" + "PositionFiltering":{ + "shape":"PositionFiltering", + "documentation":"<p>Specifies the position filtering for the tracker resource.</p> <p>Valid values:</p> <ul> <li> <p> <code>TimeBased</code> - Location updates are evaluated against linked geofence collections, but not every location update is stored. If your update frequency is more often than 30 seconds, only one update per 30 seconds is stored for each unique device ID. </p> </li> <li> <p> <code>DistanceBased</code> - If the device has moved less than 30 m (98.4 ft), location updates are ignored. Location updates within this area are neither evaluated against linked geofence collections, nor stored. This helps control costs by reducing the number of geofence evaluations and historical device positions to paginate through. Distance-based filtering can also reduce the effects of GPS noise when displaying device trajectories on a map. </p> </li> <li> <p> <code>AccuracyBased</code> - If the device has moved less than the measured accuracy, location updates are ignored. For example, if two consecutive updates from a device have a horizontal accuracy of 5 m and 10 m, the second update is ignored if the device has moved less than 15 m. Ignored location updates are neither evaluated against linked geofence collections, nor stored. This can reduce the effects of GPS noise when displaying device trajectories on a map, and can help control your costs by reducing the number of geofence evaluations. </p> </li> </ul> <p>This field is optional. If not specified, the default value is <code>TimeBased</code>.</p>" + }, + "EventBridgeEnabled":{ + "shape":"Boolean", + "documentation":"<p>Whether to enable position <code>UPDATE</code> events from this tracker to be sent to EventBridge.</p> <note> <p>You do not need enable this feature to get <code>ENTER</code> and <code>EXIT</code> events for geofences with this tracker. Those events are always sent to EventBridge.</p> </note>" + }, + "KmsKeyEnableGeospatialQueries":{ + "shape":"Boolean", + "documentation":"<p>Enables <code>GeospatialQueries</code> for a tracker that uses a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html\">Amazon Web Services KMS customer managed key</a>.</p> <p>This parameter is only used if you are using a KMS customer managed key.</p> <note> <p>If you wish to encrypt your data using your own KMS customer managed key, then the Bounding Polygon Queries feature will be disabled by default. This is because by using this feature, a representation of your device positions will not be encrypted using the your KMS managed key. The exact device position, however; is still encrypted using your managed key.</p> <p>You can choose to opt-in to the Bounding Polygon Quseries feature. This is done by setting the <code>KmsKeyEnableGeospatialQueries</code> parameter to true when creating or updating a Tracker.</p> </note>" } } }, "CreateTrackerResponse":{ "type":"structure", "required":[ - "CreateTime", + "TrackerName", "TrackerArn", - "TrackerName" + "CreateTime" ], "members":{ - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the tracker resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + "TrackerName":{ + "shape":"ResourceName", + "documentation":"<p>The name of the tracker resource.</p>" }, "TrackerArn":{ "shape":"Arn", "documentation":"<p>The Amazon Resource Name (ARN) for the tracker resource. Used when you need to specify a resource across all Amazon Web Services.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:tracker/ExampleTracker</code> </p> </li> </ul>" }, - "TrackerName":{ - "shape":"ResourceName", - "documentation":"<p>The name of the tracker resource.</p>" + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the tracker resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" } } }, @@ -2428,7 +2485,7 @@ "type":"string", "max":100, "min":1, - "pattern":"^[-._\\w]+$" + "pattern":"[-._\\w]+" }, "CustomLayerList":{ "type":"list", @@ -2467,17 +2524,17 @@ "type":"structure", "required":["KeyName"], "members":{ - "ForceDelete":{ - "shape":"Boolean", - "documentation":"<p>ForceDelete bypasses an API key's expiry conditions and deletes the key. Set the parameter <code>true</code> to delete the key or to <code>false</code> to not preemptively delete the API key.</p> <p>Valid values: <code>true</code>, or <code>false</code>.</p> <p>Required: No</p> <note> <p>This action is irreversible. Only use ForceDelete if you are certain the key is no longer in use.</p> </note>", - "location":"querystring", - "locationName":"forceDelete" - }, "KeyName":{ "shape":"ResourceName", "documentation":"<p>The name of the API key to delete.</p>", "location":"uri", "locationName":"KeyName" + }, + "ForceDelete":{ + "shape":"Boolean", + "documentation":"<p>ForceDelete bypasses an API key's expiry conditions and deletes the key. Set the parameter <code>true</code> to delete the key or to <code>false</code> to not preemptively delete the API key.</p> <p>Valid values: <code>true</code>, or <code>false</code>.</p> <p>Required: No</p> <note> <p>This action is irreversible. Only use ForceDelete if you are certain the key is no longer in use.</p> </note>", + "location":"querystring", + "locationName":"forceDelete" } } }, @@ -2569,37 +2626,25 @@ "DescribeGeofenceCollectionResponse":{ "type":"structure", "required":[ - "CollectionArn", "CollectionName", - "CreateTime", + "CollectionArn", "Description", + "CreateTime", "UpdateTime" ], "members":{ - "CollectionArn":{ - "shape":"Arn", - "documentation":"<p>The Amazon Resource Name (ARN) for the geofence collection resource. Used when you need to specify a resource across all Amazon Web Services. </p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:geofence-collection/ExampleGeofenceCollection</code> </p> </li> </ul>" - }, "CollectionName":{ "shape":"ResourceName", "documentation":"<p>The name of the geofence collection.</p>" }, - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the geofence resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" - }, - "Description":{ + "CollectionArn":{ + "shape":"Arn", + "documentation":"<p>The Amazon Resource Name (ARN) for the geofence collection resource. Used when you need to specify a resource across all Amazon Web Services. </p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:geofence-collection/ExampleGeofenceCollection</code> </p> </li> </ul>" + }, + "Description":{ "shape":"ResourceDescription", "documentation":"<p>The optional description for the geofence collection.</p>" }, - "GeofenceCount":{ - "shape":"DescribeGeofenceCollectionResponseGeofenceCountInteger", - "documentation":"<p>The number of geofences in the geofence collection.</p>" - }, - "KmsKeyId":{ - "shape":"KmsKeyId", - "documentation":"<p>A key identifier for an <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html\">Amazon Web Services KMS customer managed key</a> assigned to the Amazon Location resource</p>" - }, "PricingPlan":{ "shape":"PricingPlan", "documentation":"<p>No longer used. Always returns <code>RequestBasedUsage</code>.</p>", @@ -2612,13 +2657,25 @@ "deprecated":true, "deprecatedMessage":"Deprecated. Unused." }, + "KmsKeyId":{ + "shape":"KmsKeyId", + "documentation":"<p>A key identifier for an <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html\">Amazon Web Services KMS customer managed key</a> assigned to the Amazon Location resource</p>" + }, "Tags":{ "shape":"TagMap", "documentation":"<p>Displays the key, value pairs of tags associated with this resource.</p>" }, + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the geofence resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" + }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the geofence collection was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" + }, + "GeofenceCount":{ + "shape":"DescribeGeofenceCollectionResponseGeofenceCountInteger", + "documentation":"<p>The number of geofences in the geofence collection.</p>" } } }, @@ -2642,27 +2699,15 @@ "DescribeKeyResponse":{ "type":"structure", "required":[ - "CreateTime", - "ExpireTime", "Key", "KeyArn", "KeyName", "Restrictions", + "CreateTime", + "ExpireTime", "UpdateTime" ], "members":{ - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the API key resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" - }, - "Description":{ - "shape":"ResourceDescription", - "documentation":"<p>The optional description for the API key resource.</p>" - }, - "ExpireTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the API key resource will expire in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" - }, "Key":{ "shape":"ApiKey", "documentation":"<p>The key value/string of an API key.</p>" @@ -2676,13 +2721,25 @@ "documentation":"<p>The name of the API key resource.</p>" }, "Restrictions":{"shape":"ApiKeyRestrictions"}, - "Tags":{ - "shape":"TagMap", - "documentation":"<p>Tags associated with the API key resource.</p>" + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the API key resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + }, + "ExpireTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the API key resource will expire in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the API key resource was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + }, + "Description":{ + "shape":"ResourceDescription", + "documentation":"<p>The optional description for the API key resource.</p>" + }, + "Tags":{ + "shape":"TagMap", + "documentation":"<p>Tags associated with the API key resource.</p>" } } }, @@ -2701,49 +2758,49 @@ "DescribeMapResponse":{ "type":"structure", "required":[ - "Configuration", - "CreateTime", + "MapName", + "MapArn", "DataSource", + "Configuration", "Description", - "MapArn", - "MapName", + "CreateTime", "UpdateTime" ], "members":{ - "Configuration":{ - "shape":"MapConfiguration", - "documentation":"<p>Specifies the map tile style selected from a partner data provider.</p>" - }, - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the map resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>.</p>" - }, - "DataSource":{ - "shape":"String", - "documentation":"<p>Specifies the data provider for the associated map tiles.</p>" - }, - "Description":{ - "shape":"ResourceDescription", - "documentation":"<p>The optional description for the map resource.</p>" + "MapName":{ + "shape":"ResourceName", + "documentation":"<p>The map style selected from an available provider.</p>" }, "MapArn":{ "shape":"GeoArn", "documentation":"<p>The Amazon Resource Name (ARN) for the map resource. Used to specify a resource across all Amazon Web Services.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:map/ExampleMap</code> </p> </li> </ul>" }, - "MapName":{ - "shape":"ResourceName", - "documentation":"<p>The map style selected from an available provider.</p>" - }, "PricingPlan":{ "shape":"PricingPlan", "documentation":"<p>No longer used. Always returns <code>RequestBasedUsage</code>.</p>", "deprecated":true, "deprecatedMessage":"Deprecated. Always returns RequestBasedUsage." }, + "DataSource":{ + "shape":"String", + "documentation":"<p>Specifies the data provider for the associated map tiles.</p>" + }, + "Configuration":{ + "shape":"MapConfiguration", + "documentation":"<p>Specifies the map tile style selected from a partner data provider.</p>" + }, + "Description":{ + "shape":"ResourceDescription", + "documentation":"<p>The optional description for the map resource.</p>" + }, "Tags":{ "shape":"TagMap", "documentation":"<p>Tags associated with the map resource.</p>" }, + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the map resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>.</p>" + }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the map resource was last update in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>.</p>" @@ -2765,52 +2822,52 @@ "DescribePlaceIndexResponse":{ "type":"structure", "required":[ + "IndexName", + "IndexArn", + "Description", "CreateTime", + "UpdateTime", "DataSource", - "DataSourceConfiguration", - "Description", - "IndexArn", - "IndexName", - "UpdateTime" + "DataSourceConfiguration" ], "members":{ - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the place index resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" - }, - "DataSource":{ - "shape":"String", - "documentation":"<p>The data provider of geospatial data. Values can be one of the following:</p> <ul> <li> <p> <code>Esri</code> </p> </li> <li> <p> <code>Grab</code> </p> </li> <li> <p> <code>Here</code> </p> </li> </ul> <p>For more information about data providers, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Amazon Location Service data providers</a>.</p>" - }, - "DataSourceConfiguration":{ - "shape":"DataSourceConfiguration", - "documentation":"<p>The specified data storage option for requesting Places.</p>" - }, - "Description":{ - "shape":"ResourceDescription", - "documentation":"<p>The optional description for the place index resource.</p>" + "IndexName":{ + "shape":"ResourceName", + "documentation":"<p>The name of the place index resource being described.</p>" }, "IndexArn":{ "shape":"GeoArn", "documentation":"<p>The Amazon Resource Name (ARN) for the place index resource. Used to specify a resource across Amazon Web Services. </p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:place-index/ExamplePlaceIndex</code> </p> </li> </ul>" }, - "IndexName":{ - "shape":"ResourceName", - "documentation":"<p>The name of the place index resource being described.</p>" - }, "PricingPlan":{ "shape":"PricingPlan", "documentation":"<p>No longer used. Always returns <code>RequestBasedUsage</code>.</p>", "deprecated":true, "deprecatedMessage":"Deprecated. Always returns RequestBasedUsage." }, - "Tags":{ - "shape":"TagMap", - "documentation":"<p>Tags associated with place index resource.</p>" + "Description":{ + "shape":"ResourceDescription", + "documentation":"<p>The optional description for the place index resource.</p>" + }, + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the place index resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the place index resource was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + }, + "DataSource":{ + "shape":"String", + "documentation":"<p>The data provider of geospatial data. Values can be one of the following:</p> <ul> <li> <p> <code>Esri</code> </p> </li> <li> <p> <code>Grab</code> </p> </li> <li> <p> <code>Here</code> </p> </li> </ul> <p>For more information about data providers, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Amazon Location Service data providers</a>.</p>" + }, + "DataSourceConfiguration":{ + "shape":"DataSourceConfiguration", + "documentation":"<p>The specified data storage option for requesting Places.</p>" + }, + "Tags":{ + "shape":"TagMap", + "documentation":"<p>Tags associated with place index resource.</p>" } } }, @@ -2829,47 +2886,47 @@ "DescribeRouteCalculatorResponse":{ "type":"structure", "required":[ - "CalculatorArn", "CalculatorName", - "CreateTime", - "DataSource", + "CalculatorArn", "Description", - "UpdateTime" + "CreateTime", + "UpdateTime", + "DataSource" ], "members":{ + "CalculatorName":{ + "shape":"ResourceName", + "documentation":"<p>The name of the route calculator resource being described.</p>" + }, "CalculatorArn":{ "shape":"GeoArn", "documentation":"<p>The Amazon Resource Name (ARN) for the Route calculator resource. Use the ARN when you specify a resource across Amazon Web Services.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:route-calculator/ExampleCalculator</code> </p> </li> </ul>" }, - "CalculatorName":{ - "shape":"ResourceName", - "documentation":"<p>The name of the route calculator resource being described.</p>" + "PricingPlan":{ + "shape":"PricingPlan", + "documentation":"<p>Always returns <code>RequestBasedUsage</code>.</p>", + "deprecated":true, + "deprecatedMessage":"Deprecated. Always returns RequestBasedUsage." + }, + "Description":{ + "shape":"ResourceDescription", + "documentation":"<p>The optional description of the route calculator resource.</p>" }, "CreateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp when the route calculator resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p> <ul> <li> <p>For example, <code>2020–07-2T12:15:20.000Z+01:00</code> </p> </li> </ul>" }, + "UpdateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp when the route calculator resource was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p> <ul> <li> <p>For example, <code>2020–07-2T12:15:20.000Z+01:00</code> </p> </li> </ul>" + }, "DataSource":{ "shape":"String", "documentation":"<p>The data provider of traffic and road network data. Indicates one of the available providers:</p> <ul> <li> <p> <code>Esri</code> </p> </li> <li> <p> <code>Grab</code> </p> </li> <li> <p> <code>Here</code> </p> </li> </ul> <p>For more information about data providers, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Amazon Location Service data providers</a>.</p>" }, - "Description":{ - "shape":"ResourceDescription", - "documentation":"<p>The optional description of the route calculator resource.</p>" - }, - "PricingPlan":{ - "shape":"PricingPlan", - "documentation":"<p>Always returns <code>RequestBasedUsage</code>.</p>", - "deprecated":true, - "deprecatedMessage":"Deprecated. Always returns RequestBasedUsage." - }, "Tags":{ "shape":"TagMap", "documentation":"<p>Tags associated with route calculator resource.</p>" - }, - "UpdateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp when the route calculator resource was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p> <ul> <li> <p>For example, <code>2020–07-2T12:15:20.000Z+01:00</code> </p> </li> </ul>" } } }, @@ -2888,37 +2945,25 @@ "DescribeTrackerResponse":{ "type":"structure", "required":[ - "CreateTime", - "Description", - "TrackerArn", "TrackerName", + "TrackerArn", + "Description", + "CreateTime", "UpdateTime" ], "members":{ - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the tracker resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + "TrackerName":{ + "shape":"ResourceName", + "documentation":"<p>The name of the tracker resource.</p>" + }, + "TrackerArn":{ + "shape":"Arn", + "documentation":"<p>The Amazon Resource Name (ARN) for the tracker resource. Used when you need to specify a resource across all Amazon Web Services.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:tracker/ExampleTracker</code> </p> </li> </ul>" }, "Description":{ "shape":"ResourceDescription", "documentation":"<p>The optional description for the tracker resource.</p>" }, - "EventBridgeEnabled":{ - "shape":"Boolean", - "documentation":"<p>Whether <code>UPDATE</code> events from this tracker in EventBridge are enabled. If set to <code>true</code> these events will be sent to EventBridge.</p>" - }, - "KmsKeyEnableGeospatialQueries":{ - "shape":"Boolean", - "documentation":"<p>Enables <code>GeospatialQueries</code> for a tracker that uses a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html\">Amazon Web Services KMS customer managed key</a>.</p> <p>This parameter is only used if you are using a KMS customer managed key.</p> <note> <p>If you wish to encrypt your data using your own KMS customer managed key, then the Bounding Polygon Queries feature will be disabled by default. This is because by using this feature, a representation of your device positions will not be encrypted using the your KMS managed key. The exact device position, however; is still encrypted using your managed key.</p> <p>You can choose to opt-in to the Bounding Polygon Quseries feature. This is done by setting the <code>KmsKeyEnableGeospatialQueries</code> parameter to true when creating or updating a Tracker.</p> </note>" - }, - "KmsKeyId":{ - "shape":"KmsKeyId", - "documentation":"<p>A key identifier for an <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html\">Amazon Web Services KMS customer managed key</a> assigned to the Amazon Location resource.</p>" - }, - "PositionFiltering":{ - "shape":"PositionFiltering", - "documentation":"<p>The position filtering method of the tracker resource.</p>" - }, "PricingPlan":{ "shape":"PricingPlan", "documentation":"<p>Always returns <code>RequestBasedUsage</code>.</p>", @@ -2935,51 +2980,63 @@ "shape":"TagMap", "documentation":"<p>The tags associated with the tracker resource.</p>" }, - "TrackerArn":{ - "shape":"Arn", - "documentation":"<p>The Amazon Resource Name (ARN) for the tracker resource. Used when you need to specify a resource across all Amazon Web Services.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:tracker/ExampleTracker</code> </p> </li> </ul>" - }, - "TrackerName":{ - "shape":"ResourceName", - "documentation":"<p>The name of the tracker resource.</p>" + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the tracker resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the tracker resource was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + }, + "KmsKeyId":{ + "shape":"KmsKeyId", + "documentation":"<p>A key identifier for an <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html\">Amazon Web Services KMS customer managed key</a> assigned to the Amazon Location resource.</p>" + }, + "PositionFiltering":{ + "shape":"PositionFiltering", + "documentation":"<p>The position filtering method of the tracker resource.</p>" + }, + "EventBridgeEnabled":{ + "shape":"Boolean", + "documentation":"<p>Whether <code>UPDATE</code> events from this tracker in EventBridge are enabled. If set to <code>true</code> these events will be sent to EventBridge.</p>" + }, + "KmsKeyEnableGeospatialQueries":{ + "shape":"Boolean", + "documentation":"<p>Enables <code>GeospatialQueries</code> for a tracker that uses a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html\">Amazon Web Services KMS customer managed key</a>.</p> <p>This parameter is only used if you are using a KMS customer managed key.</p> <note> <p>If you wish to encrypt your data using your own KMS customer managed key, then the Bounding Polygon Queries feature will be disabled by default. This is because by using this feature, a representation of your device positions will not be encrypted using the your KMS managed key. The exact device position, however; is still encrypted using your managed key.</p> <p>You can choose to opt-in to the Bounding Polygon Quseries feature. This is done by setting the <code>KmsKeyEnableGeospatialQueries</code> parameter to true when creating or updating a Tracker.</p> </note>" } } }, "DevicePosition":{ "type":"structure", "required":[ - "Position", + "SampleTime", "ReceivedTime", - "SampleTime" + "Position" ], "members":{ - "Accuracy":{ - "shape":"PositionalAccuracy", - "documentation":"<p>The accuracy of the device position.</p>" - }, "DeviceId":{ "shape":"Id", "documentation":"<p>The device whose position you retrieved.</p>" }, + "SampleTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp at which the device's position was determined. Uses <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + }, + "ReceivedTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the tracker resource received the device position in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + }, "Position":{ "shape":"Position", "documentation":"<p>The last known device position.</p>" }, + "Accuracy":{ + "shape":"PositionalAccuracy", + "documentation":"<p>The accuracy of the device position.</p>" + }, "PositionProperties":{ "shape":"PropertyMap", "documentation":"<p>The properties associated with the position.</p>" - }, - "ReceivedTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the tracker resource received the device position in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" - }, - "SampleTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp at which the device's position was determined. Uses <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" } }, "documentation":"<p>Contains the device position details.</p>" @@ -2992,32 +3049,72 @@ "type":"structure", "required":[ "DeviceId", - "Position", - "SampleTime" + "SampleTime", + "Position" ], "members":{ + "DeviceId":{ + "shape":"Id", + "documentation":"<p>The device associated to the position update.</p>" + }, + "SampleTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp at which the device's position was determined. Uses <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" + }, + "Position":{ + "shape":"Position", + "documentation":"<p>The latest device position defined in <a href=\"https://earth-info.nga.mil/index.php?dir=wgs84&action=wgs84\">WGS 84</a> format: <code>[X or longitude, Y or latitude]</code>.</p>" + }, "Accuracy":{ "shape":"PositionalAccuracy", "documentation":"<p>The accuracy of the device position.</p>" }, + "PositionProperties":{ + "shape":"PropertyMap", + "documentation":"<p>Associates one of more properties with the position update. A property is a key-value pair stored with the position update and added to any geofence event the update may trigger.</p> <p>Format: <code>\"key\" : \"value\"</code> </p>" + } + }, + "documentation":"<p>Contains the position update details for a device.</p>" + }, + "DeviceState":{ + "type":"structure", + "required":[ + "DeviceId", + "SampleTime", + "Position" + ], + "members":{ "DeviceId":{ "shape":"Id", - "documentation":"<p>The device associated to the position update.</p>" + "documentation":"<p>The device identifier.</p>" + }, + "SampleTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp at which the device's position was determined. Uses <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601 </a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" }, "Position":{ "shape":"Position", - "documentation":"<p>The latest device position defined in <a href=\"https://earth-info.nga.mil/index.php?dir=wgs84&action=wgs84\">WGS 84</a> format: <code>[X or longitude, Y or latitude]</code>.</p>" + "documentation":"<p>The last known device position.</p>" }, - "PositionProperties":{ - "shape":"PropertyMap", - "documentation":"<p>Associates one of more properties with the position update. A property is a key-value pair stored with the position update and added to any geofence event the update may trigger.</p> <p>Format: <code>\"key\" : \"value\"</code> </p>" + "Accuracy":{"shape":"PositionalAccuracy"}, + "Ipv4Address":{ + "shape":"DeviceStateIpv4AddressString", + "documentation":"<p>The device's Ipv4 address.</p>" }, - "SampleTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp at which the device's position was determined. Uses <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" + "WiFiAccessPoints":{ + "shape":"WiFiAccessPointList", + "documentation":"<p>The Wi-Fi access points the device is using.</p>" + }, + "CellSignals":{ + "shape":"CellSignals", + "documentation":"<p>The cellular network infrastructure that the device is connected to.</p>" } }, - "documentation":"<p>Contains the position update details for a device.</p>" + "documentation":"<p>The device's position, IP address, and Wi-Fi access points.</p>" + }, + "DeviceStateIpv4AddressString":{ + "type":"string", + "pattern":"(?:(?:25[0-5]|(?:2[0-4]|1\\d|[0-9]|)\\d)\\.?\\b){4}" }, "DimensionUnit":{ "type":"string", @@ -3029,21 +3126,21 @@ "DisassociateTrackerConsumerRequest":{ "type":"structure", "required":[ - "ConsumerArn", - "TrackerName" + "TrackerName", + "ConsumerArn" ], "members":{ - "ConsumerArn":{ - "shape":"Arn", - "documentation":"<p>The Amazon Resource Name (ARN) for the geofence collection to be disassociated from the tracker resource. Used when you need to specify a resource across all Amazon Web Services. </p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:geofence-collection/ExampleGeofenceCollectionConsumer</code> </p> </li> </ul>", - "location":"uri", - "locationName":"ConsumerArn" - }, "TrackerName":{ "shape":"ResourceName", "documentation":"<p>The name of the tracker resource to be dissociated from the consumer.</p>", "location":"uri", "locationName":"TrackerName" + }, + "ConsumerArn":{ + "shape":"Arn", + "documentation":"<p>The Amazon Resource Name (ARN) for the geofence collection to be disassociated from the tracker resource. Used when you need to specify a resource across all Amazon Web Services. </p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:geofence-collection/ExampleGeofenceCollectionConsumer</code> </p> </li> </ul>", + "location":"uri", + "locationName":"ConsumerArn" } } }, @@ -3063,53 +3160,220 @@ "type":"double", "box":true }, + "Earfcn":{ + "type":"integer", + "max":262143, + "min":0 + }, + "EutranCellId":{ + "type":"integer", + "max":268435455, + "min":0 + }, "FilterPlaceCategoryList":{ "type":"list", "member":{"shape":"PlaceCategory"}, "max":5, "min":1 }, + "ForecastGeofenceEventsDeviceState":{ + "type":"structure", + "required":["Position"], + "members":{ + "Position":{ + "shape":"Position", + "documentation":"<p>The device's position.</p>" + }, + "Speed":{ + "shape":"ForecastGeofenceEventsDeviceStateSpeedDouble", + "documentation":"<p>The device's speed.</p>" + } + }, + "documentation":"<p>The device's position, IP address, and WiFi access points.</p>" + }, + "ForecastGeofenceEventsDeviceStateSpeedDouble":{ + "type":"double", + "box":true, + "min":0 + }, + "ForecastGeofenceEventsRequest":{ + "type":"structure", + "required":[ + "CollectionName", + "DeviceState" + ], + "members":{ + "CollectionName":{ + "shape":"ResourceName", + "documentation":"<p>The name of the geofence collection.</p>", + "location":"uri", + "locationName":"CollectionName" + }, + "DeviceState":{ + "shape":"ForecastGeofenceEventsDeviceState", + "documentation":"<p>The device's state, including current position and speed.</p>" + }, + "TimeHorizonMinutes":{ + "shape":"ForecastGeofenceEventsRequestTimeHorizonMinutesDouble", + "documentation":"<p>Specifies the time horizon in minutes for the forecasted events.</p>" + }, + "DistanceUnit":{ + "shape":"DistanceUnit", + "documentation":"<p>The distance unit used for the <code>NearestDistance</code> property returned in a forecasted event. The measurement system must match for <code>DistanceUnit</code> and <code>SpeedUnit</code>; if <code>Kilometers</code> is specified for <code>DistanceUnit</code>, then <code>SpeedUnit</code> must be <code>KilometersPerHour</code>. </p> <p>Default Value: <code>Kilometers</code> </p>" + }, + "SpeedUnit":{ + "shape":"SpeedUnit", + "documentation":"<p>The speed unit for the device captured by the device state. The measurement system must match for <code>DistanceUnit</code> and <code>SpeedUnit</code>; if <code>Kilometers</code> is specified for <code>DistanceUnit</code>, then <code>SpeedUnit</code> must be <code>KilometersPerHour</code>.</p> <p>Default Value: <code>KilometersPerHour</code>.</p>" + }, + "NextToken":{ + "shape":"LargeToken", + "documentation":"<p>The pagination token specifying which page of results to return in the response. If no token is provided, the default page is the first page.</p> <p>Default value: <code>null</code> </p>" + }, + "MaxResults":{ + "shape":"ForecastGeofenceEventsRequestMaxResultsInteger", + "documentation":"<p>An optional limit for the number of resources returned in a single call.</p> <p>Default value: <code>20</code> </p>" + } + } + }, + "ForecastGeofenceEventsRequestMaxResultsInteger":{ + "type":"integer", + "box":true, + "max":20, + "min":1 + }, + "ForecastGeofenceEventsRequestTimeHorizonMinutesDouble":{ + "type":"double", + "box":true, + "min":0 + }, + "ForecastGeofenceEventsResponse":{ + "type":"structure", + "required":[ + "ForecastedEvents", + "DistanceUnit", + "SpeedUnit" + ], + "members":{ + "ForecastedEvents":{ + "shape":"ForecastedEventsList", + "documentation":"<p>The list of forecasted events.</p>" + }, + "NextToken":{ + "shape":"LargeToken", + "documentation":"<p>The pagination token specifying which page of results to return in the response. If no token is provided, the default page is the first page. </p>" + }, + "DistanceUnit":{ + "shape":"DistanceUnit", + "documentation":"<p>The distance unit for the forecasted events.</p>" + }, + "SpeedUnit":{ + "shape":"SpeedUnit", + "documentation":"<p>The speed unit for the forecasted events.</p>" + } + } + }, + "ForecastedEvent":{ + "type":"structure", + "required":[ + "EventId", + "GeofenceId", + "IsDeviceInGeofence", + "NearestDistance", + "EventType" + ], + "members":{ + "EventId":{ + "shape":"Uuid", + "documentation":"<p>The forecasted event identifier.</p>" + }, + "GeofenceId":{ + "shape":"Id", + "documentation":"<p>The geofence identifier pertaining to the forecasted event.</p>" + }, + "IsDeviceInGeofence":{ + "shape":"Boolean", + "documentation":"<p>Indicates if the device is located within the geofence.</p>" + }, + "NearestDistance":{ + "shape":"NearestDistance", + "documentation":"<p>The closest distance from the device's position to the geofence.</p>" + }, + "EventType":{ + "shape":"ForecastedGeofenceEventType", + "documentation":"<p>The event type, forecasting three states for which a device can be in relative to a geofence:</p> <p> <code>ENTER</code>: If a device is outside of a geofence, but would breach the fence if the device is moving at its current speed within time horizon window.</p> <p> <code>EXIT</code>: If a device is inside of a geofence, but would breach the fence if the device is moving at its current speed within time horizon window.</p> <p> <code>IDLE</code>: If a device is inside of a geofence, and the device is not moving.</p>" + }, + "ForecastedBreachTime":{ + "shape":"Timestamp", + "documentation":"<p>The forecasted time the device will breach the geofence in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" + }, + "GeofenceProperties":{ + "shape":"PropertyMap", + "documentation":"<p>The geofence properties.</p>" + } + }, + "documentation":"<p>A forecasted event represents a geofence event in relation to the requested device state, that may occur given the provided device state and time horizon.</p>" + }, + "ForecastedEventsList":{ + "type":"list", + "member":{"shape":"ForecastedEvent"} + }, + "ForecastedGeofenceEventType":{ + "type":"string", + "enum":[ + "ENTER", + "EXIT", + "IDLE" + ] + }, "GeoArn":{ "type":"string", "max":1600, "min":0, - "pattern":"^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0-9]+)*))(:[0-9]+):((\\*)|([-a-z]+[/][*-._\\w]+))$" + "pattern":"arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0-9]+)*))(:[0-9]+):((\\*)|([-a-z]+[/][*-._\\w]+))" + }, + "GeoArnV2":{ + "type":"string", + "max":1600, + "min":0, + "pattern":".*(^arn(:[a-z0-9]+([.-][a-z0-9]+)*):geo(:([a-z0-9]+([.-][a-z0-9]+)*))(:[0-9]+):((\\*)|([-a-z]+[/][*-._\\w]+))$)|(^arn(:[a-z0-9]+([.-][a-z0-9]+)*):(geo-routes|geo-places|geo-maps)(:((\\*)|([a-z0-9]+([.-][a-z0-9]+)*)))::((provider[\\/][*-._\\w]+))$).*" }, "GeofenceGeometry":{ "type":"structure", "members":{ + "Polygon":{ + "shape":"LinearRings", + "documentation":"<p>A polygon is a list of linear rings which are each made up of a list of vertices.</p> <p>Each vertex is a 2-dimensional point of the form: <code>[longitude, latitude]</code>. This is represented as an array of doubles of length 2 (so <code>[double, double]</code>).</p> <p>An array of 4 or more vertices, where the first and last vertex are the same (to form a closed boundary), is called a linear ring. The linear ring vertices must be listed in counter-clockwise order around the ring’s interior. The linear ring is represented as an array of vertices, or an array of arrays of doubles (<code>[[double, double], ...]</code>).</p> <p>A geofence consists of a single linear ring. To allow for future expansion, the Polygon parameter takes an array of linear rings, which is represented as an array of arrays of arrays of doubles (<code>[[[double, double], ...], ...]</code>).</p> <p>A linear ring for use in geofences can consist of between 4 and 1,000 vertices.</p>" + }, "Circle":{ "shape":"Circle", "documentation":"<p>A circle on the earth, as defined by a center point and a radius.</p>" }, - "Polygon":{ - "shape":"LinearRings", - "documentation":"<p>A polygon is a list of linear rings which are each made up of a list of vertices.</p> <p>Each vertex is a 2-dimensional point of the form: <code>[longitude, latitude]</code>. This is represented as an array of doubles of length 2 (so <code>[double, double]</code>).</p> <p>An array of 4 or more vertices, where the first and last vertex are the same (to form a closed boundary), is called a linear ring. The linear ring vertices must be listed in counter-clockwise order around the ring’s interior. The linear ring is represented as an array of vertices, or an array of arrays of doubles (<code>[[double, double], ...]</code>).</p> <p>A geofence consists of a single linear ring. To allow for future expansion, the Polygon parameter takes an array of linear rings, which is represented as an array of arrays of arrays of doubles (<code>[[[double, double], ...], ...]</code>).</p> <p>A linear ring for use in geofences can consist of between 4 and 1,000 vertices.</p>" + "Geobuf":{ + "shape":"Base64EncodedGeobuf", + "documentation":"<p>Geobuf is a compact binary encoding for geographic data that provides lossless compression of GeoJSON polygons. The Geobuf must be Base64-encoded.</p> <p>A polygon in Geobuf format can have up to 100,000 vertices.</p>" } }, - "documentation":"<p>Contains the geofence geometry details.</p> <p>A geofence geometry is made up of either a polygon or a circle. Can be either a polygon or a circle. Including both will return a validation error.</p> <note> <p>Amazon Location doesn't currently support polygons with holes, multipolygons, polygons that are wound clockwise, or that cross the antimeridian. </p> </note>" + "documentation":"<p>Contains the geofence geometry details.</p> <p>A geofence geometry is made up of either a polygon or a circle. Can be a polygon, a circle or a polygon encoded in Geobuf format. Including multiple selections will return a validation error.</p> <note> <p>Amazon Location doesn't currently support polygons with holes, multipolygons, polygons that are wound clockwise, or that cross the antimeridian. </p> </note>" }, "GetDevicePositionHistoryRequest":{ "type":"structure", "required":[ - "DeviceId", - "TrackerName" + "TrackerName", + "DeviceId" ], "members":{ + "TrackerName":{ + "shape":"ResourceName", + "documentation":"<p>The tracker resource receiving the request for the device position history.</p>", + "location":"uri", + "locationName":"TrackerName" + }, "DeviceId":{ "shape":"Id", "documentation":"<p>The device whose position history you want to retrieve.</p>", "location":"uri", "locationName":"DeviceId" }, - "EndTimeExclusive":{ - "shape":"Timestamp", - "documentation":"<p>Specify the end time for the position history in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. By default, the value will be the time that the request is made.</p> <p>Requirement:</p> <ul> <li> <p>The time specified for <code>EndTimeExclusive</code> must be after the time for <code>StartTimeInclusive</code>.</p> </li> </ul>" - }, - "MaxResults":{ - "shape":"GetDevicePositionHistoryRequestMaxResultsInteger", - "documentation":"<p>An optional limit for the number of device positions returned in a single call.</p> <p>Default value: <code>100</code> </p>" - }, "NextToken":{ "shape":"Token", "documentation":"<p>The pagination token specifying which page of results to return in the response. If no token is provided, the default page is the first page. </p> <p>Default value: <code>null</code> </p>" @@ -3118,11 +3382,13 @@ "shape":"Timestamp", "documentation":"<p>Specify the start time for the position history in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. By default, the value will be 24 hours prior to the time that the request is made.</p> <p>Requirement:</p> <ul> <li> <p>The time specified for <code>StartTimeInclusive</code> must be before <code>EndTimeExclusive</code>.</p> </li> </ul>" }, - "TrackerName":{ - "shape":"ResourceName", - "documentation":"<p>The tracker resource receiving the request for the device position history.</p>", - "location":"uri", - "locationName":"TrackerName" + "EndTimeExclusive":{ + "shape":"Timestamp", + "documentation":"<p>Specify the end time for the position history in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. By default, the value will be the time that the request is made.</p> <p>Requirement:</p> <ul> <li> <p>The time specified for <code>EndTimeExclusive</code> must be after the time for <code>StartTimeInclusive</code>.</p> </li> </ul>" + }, + "MaxResults":{ + "shape":"GetDevicePositionHistoryRequestMaxResultsInteger", + "documentation":"<p>An optional limit for the number of device positions returned in a single call.</p> <p>Default value: <code>100</code> </p>" } } }, @@ -3149,55 +3415,55 @@ "GetDevicePositionRequest":{ "type":"structure", "required":[ - "DeviceId", - "TrackerName" + "TrackerName", + "DeviceId" ], "members":{ - "DeviceId":{ - "shape":"Id", - "documentation":"<p>The device whose position you want to retrieve.</p>", - "location":"uri", - "locationName":"DeviceId" - }, "TrackerName":{ "shape":"ResourceName", "documentation":"<p>The tracker resource receiving the position update.</p>", "location":"uri", "locationName":"TrackerName" + }, + "DeviceId":{ + "shape":"Id", + "documentation":"<p>The device whose position you want to retrieve.</p>", + "location":"uri", + "locationName":"DeviceId" } } }, "GetDevicePositionResponse":{ "type":"structure", "required":[ - "Position", + "SampleTime", "ReceivedTime", - "SampleTime" + "Position" ], "members":{ - "Accuracy":{ - "shape":"PositionalAccuracy", - "documentation":"<p>The accuracy of the device position.</p>" - }, "DeviceId":{ "shape":"Id", "documentation":"<p>The device whose position you retrieved.</p>" }, + "SampleTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp at which the device's position was determined. Uses <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601 </a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + }, + "ReceivedTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the tracker resource received the device position. Uses <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601 </a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + }, "Position":{ "shape":"Position", "documentation":"<p>The last known device position.</p>" }, + "Accuracy":{ + "shape":"PositionalAccuracy", + "documentation":"<p>The accuracy of the device position.</p>" + }, "PositionProperties":{ "shape":"PropertyMap", "documentation":"<p>The properties associated with the position.</p>" - }, - "ReceivedTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the tracker resource received the device position in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601 </a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" - }, - "SampleTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp at which the device's position was determined. Uses <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601 </a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" } } }, @@ -3225,25 +3491,17 @@ "GetGeofenceResponse":{ "type":"structure", "required":[ - "CreateTime", "GeofenceId", "Geometry", "Status", + "CreateTime", "UpdateTime" ], "members":{ - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the geofence collection was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" - }, "GeofenceId":{ "shape":"Id", "documentation":"<p>The geofence identifier.</p>" }, - "GeofenceProperties":{ - "shape":"PropertyMap", - "documentation":"<p>User defined properties of the geofence. A property is a key-value pair stored with the geofence and added to any geofence event triggered with that geofence.</p> <p>Format: <code>\"key\" : \"value\"</code> </p>" - }, "Geometry":{ "shape":"GeofenceGeometry", "documentation":"<p>Contains the geofence geometry details describing a polygon or a circle.</p>" @@ -3252,23 +3510,37 @@ "shape":"String", "documentation":"<p>Identifies the state of the geofence. A geofence will hold one of the following states:</p> <ul> <li> <p> <code>ACTIVE</code> — The geofence has been indexed by the system. </p> </li> <li> <p> <code>PENDING</code> — The geofence is being processed by the system.</p> </li> <li> <p> <code>FAILED</code> — The geofence failed to be indexed by the system.</p> </li> <li> <p> <code>DELETED</code> — The geofence has been deleted from the system index.</p> </li> <li> <p> <code>DELETING</code> — The geofence is being deleted from the system index.</p> </li> </ul>" }, + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the geofence collection was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" + }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the geofence collection was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" + }, + "GeofenceProperties":{ + "shape":"PropertyMap", + "documentation":"<p>User defined properties of the geofence. A property is a key-value pair stored with the geofence and added to any geofence event triggered with that geofence.</p> <p>Format: <code>\"key\" : \"value\"</code> </p>" } } }, "GetMapGlyphsRequest":{ "type":"structure", "required":[ + "MapName", "FontStack", - "FontUnicodeRange", - "MapName" + "FontUnicodeRange" ], "members":{ + "MapName":{ + "shape":"ResourceName", + "documentation":"<p>The map resource associated with the glyph file.</p>", + "location":"uri", + "locationName":"MapName" + }, "FontStack":{ "shape":"String", - "documentation":"<p>A comma-separated list of fonts to load glyphs from in order of preference. For example, <code>Noto Sans Regular, Arial Unicode</code>.</p> <p>Valid font stacks for <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/esri.html\">Esri</a> styles: </p> <ul> <li> <p>VectorEsriDarkGrayCanvas – <code>Ubuntu Medium Italic</code> | <code>Ubuntu Medium</code> | <code>Ubuntu Italic</code> | <code>Ubuntu Regular</code> | <code>Ubuntu Bold</code> </p> </li> <li> <p>VectorEsriLightGrayCanvas – <code>Ubuntu Italic</code> | <code>Ubuntu Regular</code> | <code>Ubuntu Light</code> | <code>Ubuntu Bold</code> </p> </li> <li> <p>VectorEsriTopographic – <code>Noto Sans Italic</code> | <code>Noto Sans Regular</code> | <code>Noto Sans Bold</code> | <code>Noto Serif Regular</code> | <code>Roboto Condensed Light Italic</code> </p> </li> <li> <p>VectorEsriStreets – <code>Arial Regular</code> | <code>Arial Italic</code> | <code>Arial Bold</code> </p> </li> <li> <p>VectorEsriNavigation – <code>Arial Regular</code> | <code>Arial Italic</code> | <code>Arial Bold</code> | <code>Arial Unicode MS Bold</code> | <code>Arial Unicode MS Regular</code> </p> </li> </ul> <p>Valid font stacks for <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/HERE.html\">HERE Technologies</a> styles:</p> <ul> <li> <p>VectorHereContrast – <code>Fira GO Regular</code> | <code>Fira GO Bold</code> </p> </li> <li> <p>VectorHereExplore, VectorHereExploreTruck, HybridHereExploreSatellite – <code>Fira GO Italic</code> | <code>Fira GO Map</code> | <code>Fira GO Map Bold</code> | <code>Noto Sans CJK JP Bold</code> | <code>Noto Sans CJK JP Light</code> | <code>Noto Sans CJK JP Regular</code> </p> </li> </ul> <p>Valid font stacks for <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html\">GrabMaps</a> styles:</p> <ul> <li> <p>VectorGrabStandardLight, VectorGrabStandardDark – <code>Noto Sans Regular</code> | <code>Noto Sans Medium</code> | <code>Noto Sans Bold</code> </p> </li> </ul> <p>Valid font stacks for <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/open-data.html\">Open Data</a> styles:</p> <ul> <li> <p>VectorOpenDataStandardLight, VectorOpenDataStandardDark, VectorOpenDataVisualizationLight, VectorOpenDataVisualizationDark – <code>Amazon Ember Regular,Noto Sans Regular</code> | <code>Amazon Ember Bold,Noto Sans Bold</code> | <code>Amazon Ember Medium,Noto Sans Medium</code> | <code>Amazon Ember Regular Italic,Noto Sans Italic</code> | <code>Amazon Ember Condensed RC Regular,Noto Sans Regular</code> | <code>Amazon Ember Condensed RC Bold,Noto Sans Bold</code> | <code>Amazon Ember Regular,Noto Sans Regular,Noto Sans Arabic Regular</code> | <code>Amazon Ember Condensed RC Bold,Noto Sans Bold,Noto Sans Arabic Condensed Bold</code> | <code>Amazon Ember Bold,Noto Sans Bold,Noto Sans Arabic Bold</code> | <code>Amazon Ember Regular Italic,Noto Sans Italic,Noto Sans Arabic Regular</code> | <code>Amazon Ember Condensed RC Regular,Noto Sans Regular,Noto Sans Arabic Condensed Regular</code> | <code>Amazon Ember Medium,Noto Sans Medium,Noto Sans Arabic Medium</code> </p> </li> </ul> <note> <p>The fonts used by the Open Data map styles are combined fonts that use <code>Amazon Ember</code> for most glyphs but <code>Noto Sans</code> for glyphs unsupported by <code>Amazon Ember</code>.</p> </note>", + "documentation":"<p>A comma-separated list of fonts to load glyphs from in order of preference. For example, <code>Noto Sans Regular, Arial Unicode</code>.</p> <p>Valid font stacks for <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/esri.html\">Esri</a> styles: </p> <ul> <li> <p>VectorEsriDarkGrayCanvas – <code>Ubuntu Medium Italic</code> | <code>Ubuntu Medium</code> | <code>Ubuntu Italic</code> | <code>Ubuntu Regular</code> | <code>Ubuntu Bold</code> </p> </li> <li> <p>VectorEsriLightGrayCanvas – <code>Ubuntu Italic</code> | <code>Ubuntu Regular</code> | <code>Ubuntu Light</code> | <code>Ubuntu Bold</code> </p> </li> <li> <p>VectorEsriTopographic – <code>Noto Sans Italic</code> | <code>Noto Sans Regular</code> | <code>Noto Sans Bold</code> | <code>Noto Serif Regular</code> | <code>Roboto Condensed Light Italic</code> </p> </li> <li> <p>VectorEsriStreets – <code>Arial Regular</code> | <code>Arial Italic</code> | <code>Arial Bold</code> </p> </li> <li> <p>VectorEsriNavigation – <code>Arial Regular</code> | <code>Arial Italic</code> | <code>Arial Bold</code> </p> </li> </ul> <p>Valid font stacks for <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/HERE.html\">HERE Technologies</a> styles:</p> <ul> <li> <p>VectorHereContrast – <code>Fira GO Regular</code> | <code>Fira GO Bold</code> </p> </li> <li> <p>VectorHereExplore, VectorHereExploreTruck, HybridHereExploreSatellite – <code>Fira GO Italic</code> | <code>Fira GO Map</code> | <code>Fira GO Map Bold</code> | <code>Noto Sans CJK JP Bold</code> | <code>Noto Sans CJK JP Light</code> | <code>Noto Sans CJK JP Regular</code> </p> </li> </ul> <p>Valid font stacks for <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html\">GrabMaps</a> styles:</p> <ul> <li> <p>VectorGrabStandardLight, VectorGrabStandardDark – <code>Noto Sans Regular</code> | <code>Noto Sans Medium</code> | <code>Noto Sans Bold</code> </p> </li> </ul> <p>Valid font stacks for <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/open-data.html\">Open Data</a> styles:</p> <ul> <li> <p>VectorOpenDataStandardLight, VectorOpenDataStandardDark, VectorOpenDataVisualizationLight, VectorOpenDataVisualizationDark – <code>Amazon Ember Regular,Noto Sans Regular</code> | <code>Amazon Ember Bold,Noto Sans Bold</code> | <code>Amazon Ember Medium,Noto Sans Medium</code> | <code>Amazon Ember Regular Italic,Noto Sans Italic</code> | <code>Amazon Ember Condensed RC Regular,Noto Sans Regular</code> | <code>Amazon Ember Condensed RC Bold,Noto Sans Bold</code> | <code>Amazon Ember Regular,Noto Sans Regular,Noto Sans Arabic Regular</code> | <code>Amazon Ember Condensed RC Bold,Noto Sans Bold,Noto Sans Arabic Condensed Bold</code> | <code>Amazon Ember Bold,Noto Sans Bold,Noto Sans Arabic Bold</code> | <code>Amazon Ember Regular Italic,Noto Sans Italic,Noto Sans Arabic Regular</code> | <code>Amazon Ember Condensed RC Regular,Noto Sans Regular,Noto Sans Arabic Condensed Regular</code> | <code>Amazon Ember Medium,Noto Sans Medium,Noto Sans Arabic Medium</code> </p> </li> </ul> <note> <p>The fonts used by the Open Data map styles are combined fonts that use <code>Amazon Ember</code> for most glyphs but <code>Noto Sans</code> for glyphs unsupported by <code>Amazon Ember</code>.</p> </note>", "location":"uri", "locationName":"FontStack" }, @@ -3283,18 +3555,12 @@ "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", "location":"querystring", "locationName":"key" - }, - "MapName":{ - "shape":"ResourceName", - "documentation":"<p>The map resource associated with the glyph file.</p>", - "location":"uri", - "locationName":"MapName" } } }, "GetMapGlyphsRequestFontUnicodeRangeString":{ "type":"string", - "pattern":"^[0-9]+-[0-9]+\\.pbf$" + "pattern":"[0-9]+-[0-9]+\\.pbf" }, "GetMapGlyphsResponse":{ "type":"structure", @@ -3303,17 +3569,17 @@ "shape":"Blob", "documentation":"<p>The glyph, as binary blob.</p>" }, - "CacheControl":{ - "shape":"String", - "documentation":"<p>The HTTP Cache-Control directive for the value.</p>", - "location":"header", - "locationName":"Cache-Control" - }, "ContentType":{ "shape":"String", "documentation":"<p>The map glyph content type. For example, <code>application/octet-stream</code>.</p>", "location":"header", "locationName":"Content-Type" + }, + "CacheControl":{ + "shape":"String", + "documentation":"<p>The HTTP Cache-Control directive for the value.</p>", + "location":"header", + "locationName":"Cache-Control" } }, "payload":"Blob" @@ -3321,33 +3587,33 @@ "GetMapSpritesRequest":{ "type":"structure", "required":[ - "FileName", - "MapName" + "MapName", + "FileName" ], "members":{ + "MapName":{ + "shape":"ResourceName", + "documentation":"<p>The map resource associated with the sprite file.</p>", + "location":"uri", + "locationName":"MapName" + }, "FileName":{ "shape":"GetMapSpritesRequestFileNameString", "documentation":"<p>The name of the sprite file. Use the following file names for the sprite sheet:</p> <ul> <li> <p> <code>sprites.png</code> </p> </li> <li> <p> <code>sprites@2x.png</code> for high pixel density displays</p> </li> </ul> <p>For the JSON document containing image offsets. Use the following file names:</p> <ul> <li> <p> <code>sprites.json</code> </p> </li> <li> <p> <code>sprites@2x.json</code> for high pixel density displays</p> </li> </ul>", "location":"uri", "locationName":"FileName" }, - "Key":{ - "shape":"ApiKey", - "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", - "location":"querystring", - "locationName":"key" - }, - "MapName":{ - "shape":"ResourceName", - "documentation":"<p>The map resource associated with the sprite file.</p>", - "location":"uri", - "locationName":"MapName" + "Key":{ + "shape":"ApiKey", + "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", + "location":"querystring", + "locationName":"key" } } }, "GetMapSpritesRequestFileNameString":{ "type":"string", - "pattern":"^sprites(@2x)?\\.(png|json)$" + "pattern":"sprites(@2x)?\\.(png|json)" }, "GetMapSpritesResponse":{ "type":"structure", @@ -3356,17 +3622,17 @@ "shape":"Blob", "documentation":"<p>Contains the body of the sprite sheet or JSON offset file.</p>" }, - "CacheControl":{ - "shape":"String", - "documentation":"<p>The HTTP Cache-Control directive for the value.</p>", - "location":"header", - "locationName":"Cache-Control" - }, "ContentType":{ "shape":"String", "documentation":"<p>The content type of the sprite sheet and offsets. For example, the sprite sheet content type is <code>image/png</code>, and the sprite offset JSON document is <code>application/json</code>. </p>", "location":"header", "locationName":"Content-Type" + }, + "CacheControl":{ + "shape":"String", + "documentation":"<p>The HTTP Cache-Control directive for the value.</p>", + "location":"header", + "locationName":"Cache-Control" } }, "payload":"Blob" @@ -3375,17 +3641,17 @@ "type":"structure", "required":["MapName"], "members":{ - "Key":{ - "shape":"ApiKey", - "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", - "location":"querystring", - "locationName":"key" - }, "MapName":{ "shape":"ResourceName", "documentation":"<p>The map resource to retrieve the style descriptor from.</p>", "location":"uri", "locationName":"MapName" + }, + "Key":{ + "shape":"ApiKey", + "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", + "location":"querystring", + "locationName":"key" } } }, @@ -3396,17 +3662,17 @@ "shape":"Blob", "documentation":"<p>Contains the body of the style descriptor.</p>" }, - "CacheControl":{ - "shape":"String", - "documentation":"<p>The HTTP Cache-Control directive for the value.</p>", - "location":"header", - "locationName":"Cache-Control" - }, "ContentType":{ "shape":"String", "documentation":"<p>The style descriptor's content type. For example, <code>application/json</code>.</p>", "location":"header", "locationName":"Content-Type" + }, + "CacheControl":{ + "shape":"String", + "documentation":"<p>The HTTP Cache-Control directive for the value.</p>", + "location":"header", + "locationName":"Cache-Control" } }, "payload":"Blob" @@ -3415,23 +3681,23 @@ "type":"structure", "required":[ "MapName", + "Z", "X", - "Y", - "Z" + "Y" ], "members":{ - "Key":{ - "shape":"ApiKey", - "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", - "location":"querystring", - "locationName":"key" - }, "MapName":{ "shape":"ResourceName", "documentation":"<p>The map resource to retrieve the map tiles from.</p>", "location":"uri", "locationName":"MapName" }, + "Z":{ + "shape":"GetMapTileRequestZString", + "documentation":"<p>The zoom value for the map tile.</p>", + "location":"uri", + "locationName":"Z" + }, "X":{ "shape":"GetMapTileRequestXString", "documentation":"<p>The X axis value for the map tile.</p>", @@ -3444,25 +3710,25 @@ "location":"uri", "locationName":"Y" }, - "Z":{ - "shape":"GetMapTileRequestZString", - "documentation":"<p>The zoom value for the map tile.</p>", - "location":"uri", - "locationName":"Z" + "Key":{ + "shape":"ApiKey", + "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", + "location":"querystring", + "locationName":"key" } } }, "GetMapTileRequestXString":{ "type":"string", - "pattern":"\\d+" + "pattern":".*\\d+.*" }, "GetMapTileRequestYString":{ "type":"string", - "pattern":"\\d+" + "pattern":".*\\d+.*" }, "GetMapTileRequestZString":{ "type":"string", - "pattern":"\\d+" + "pattern":".*\\d+.*" }, "GetMapTileResponse":{ "type":"structure", @@ -3471,17 +3737,17 @@ "shape":"Blob", "documentation":"<p>Contains Mapbox Vector Tile (MVT) data.</p>" }, - "CacheControl":{ - "shape":"String", - "documentation":"<p>The HTTP Cache-Control directive for the value.</p>", - "location":"header", - "locationName":"Cache-Control" - }, "ContentType":{ "shape":"String", "documentation":"<p>The map tile's content type. For example, <code>application/vnd.mapbox-vector-tile</code>.</p>", "location":"header", "locationName":"Content-Type" + }, + "CacheControl":{ + "shape":"String", + "documentation":"<p>The HTTP Cache-Control directive for the value.</p>", + "location":"header", + "locationName":"Cache-Control" } }, "payload":"Blob" @@ -3499,11 +3765,11 @@ "location":"uri", "locationName":"IndexName" }, - "Key":{ - "shape":"ApiKey", - "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", - "location":"querystring", - "locationName":"key" + "PlaceId":{ + "shape":"PlaceId", + "documentation":"<p>The identifier of the place to find.</p>", + "location":"uri", + "locationName":"PlaceId" }, "Language":{ "shape":"LanguageTag", @@ -3511,11 +3777,11 @@ "location":"querystring", "locationName":"language" }, - "PlaceId":{ - "shape":"PlaceId", - "documentation":"<p>The identifier of the place to find.</p> <p>While you can use PlaceID in subsequent requests, PlaceID is not intended to be a permanent identifier and the ID can change between consecutive API calls. Please see the following PlaceID behaviour for each data provider:</p> <ul> <li> <p>Esri: Place IDs will change every quarter at a minimum. The typical time period for these changes would be March, June, September, and December. Place IDs might also change between the typical quarterly change but that will be much less frequent.</p> </li> <li> <p>HERE: We recommend that you cache data for no longer than a week to keep your data data fresh. You can assume that less than 1% ID shifts will release over release which is approximately 1 - 2 times per week.</p> </li> <li> <p>Grab: Place IDs can expire or become invalid in the following situations.</p> <ul> <li> <p>Data operations: The POI may be removed from Grab POI database by Grab Map Ops based on the ground-truth, such as being closed in the real world, being detected as a duplicate POI, or having incorrect information. Grab will synchronize data to the Waypoint environment on weekly basis.</p> </li> <li> <p>Interpolated POI: Interpolated POI is a temporary POI generated in real time when serving a request, and it will be marked as derived in the <code>place.result_type</code> field in the response. The information of interpolated POIs will be retained for at least 30 days, which means that within 30 days, you are able to obtain POI details by Place ID from Place Details API. After 30 days, the interpolated POIs(both Place ID and details) may expire and inaccessible from the Places Details API.</p> </li> </ul> </li> </ul>", - "location":"uri", - "locationName":"PlaceId" + "Key":{ + "shape":"ApiKey", + "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", + "location":"querystring", + "locationName":"key" } } }, @@ -3533,7 +3799,30 @@ "type":"string", "max":100, "min":1, - "pattern":"^[-._\\p{L}\\p{N}]+$" + "pattern":"[-._\\p{L}\\p{N}]+" + }, + "InferredState":{ + "type":"structure", + "required":["ProxyDetected"], + "members":{ + "Position":{ + "shape":"Position", + "documentation":"<p>The device position inferred by the provided position, IP address, cellular signals, and Wi-Fi- access points.</p>" + }, + "Accuracy":{ + "shape":"PositionalAccuracy", + "documentation":"<p>The level of certainty of the inferred position.</p>" + }, + "DeviationDistance":{ + "shape":"Double", + "documentation":"<p>The distance between the inferred position and the device's self-reported position.</p>" + }, + "ProxyDetected":{ + "shape":"Boolean", + "documentation":"<p>Indicates if a proxy was used.</p>" + } + }, + "documentation":"<p>The inferred state of the device, given the provided position, IP address, cellular signals, and Wi-Fi- access points.</p>" }, "Integer":{ "type":"integer", @@ -3571,16 +3860,29 @@ "max":35, "min":2 }, + "LargeToken":{ + "type":"string", + "max":60000, + "min":1 + }, "Leg":{ "type":"structure", "required":[ + "StartPosition", + "EndPosition", "Distance", "DurationSeconds", - "EndPosition", - "StartPosition", "Steps" ], "members":{ + "StartPosition":{ + "shape":"Position", + "documentation":"<p>The starting position of the leg. Follows the format <code>[longitude,latitude]</code>.</p> <note> <p>If the <code>StartPosition</code> isn't located on a road, it's <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/snap-to-nearby-road.html\">snapped to a nearby road</a>. </p> </note>" + }, + "EndPosition":{ + "shape":"Position", + "documentation":"<p>The terminating position of the leg. Follows the format <code>[longitude,latitude]</code>.</p> <note> <p>If the <code>EndPosition</code> isn't located on a road, it's <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/nap-to-nearby-road.html\">snapped to a nearby road</a>. </p> </note>" + }, "Distance":{ "shape":"LegDistanceDouble", "documentation":"<p>The distance between the leg's <code>StartPosition</code> and <code>EndPosition</code> along a calculated route. </p> <ul> <li> <p>The default measurement is <code>Kilometers</code> unless the request specifies a <code>DistanceUnit</code> of <code>Miles</code>.</p> </li> </ul>" @@ -3589,18 +3891,10 @@ "shape":"LegDurationSecondsDouble", "documentation":"<p>The estimated travel time between the leg's <code>StartPosition</code> and <code>EndPosition</code>. The travel mode and departure time that you specify in the request determines the calculated time.</p>" }, - "EndPosition":{ - "shape":"Position", - "documentation":"<p>The terminating position of the leg. Follows the format <code>[longitude,latitude]</code>.</p> <note> <p>If the <code>EndPosition</code> isn't located on a road, it's <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/nap-to-nearby-road.html\">snapped to a nearby road</a>. </p> </note>" - }, "Geometry":{ "shape":"LegGeometry", "documentation":"<p>Contains the calculated route's path as a linestring geometry.</p>" }, - "StartPosition":{ - "shape":"Position", - "documentation":"<p>The starting position of the leg. Follows the format <code>[longitude,latitude]</code>.</p> <note> <p>If the <code>StartPosition</code> isn't located on a road, it's <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/snap-to-nearby-road.html\">snapped to a nearby road</a>. </p> </note>" - }, "Steps":{ "shape":"StepList", "documentation":"<p>Contains a list of steps, which represent subsections of a leg. Each step provides instructions for how to move to the next step in the leg such as the step's start position, end position, travel distance, travel duration, and geometry offset.</p>" @@ -3651,9 +3945,11 @@ "type":"structure", "required":["TrackerName"], "members":{ - "FilterGeometry":{ - "shape":"TrackingFilterGeometry", - "documentation":"<p>The geometry used to filter device positions.</p>" + "TrackerName":{ + "shape":"ResourceName", + "documentation":"<p>The tracker resource containing the requested devices.</p>", + "location":"uri", + "locationName":"TrackerName" }, "MaxResults":{ "shape":"ListDevicePositionsRequestMaxResultsInteger", @@ -3663,11 +3959,9 @@ "shape":"Token", "documentation":"<p>The pagination token specifying which page of results to return in the response. If no token is provided, the default page is the first page.</p> <p>Default value: <code>null</code> </p>" }, - "TrackerName":{ - "shape":"ResourceName", - "documentation":"<p>The tracker resource containing the requested devices.</p>", - "location":"uri", - "locationName":"TrackerName" + "FilterGeometry":{ + "shape":"TrackingFilterGeometry", + "documentation":"<p>The geometry used to filter device positions.</p>" } } }, @@ -3695,29 +3989,29 @@ "type":"structure", "required":[ "DeviceId", - "Position", - "SampleTime" + "SampleTime", + "Position" ], "members":{ - "Accuracy":{ - "shape":"PositionalAccuracy", - "documentation":"<p>The accuracy of the device position.</p>" - }, "DeviceId":{ "shape":"Id", "documentation":"<p>The ID of the device for this position.</p>" }, + "SampleTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp at which the device position was determined. Uses <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>.</p>" + }, "Position":{ "shape":"Position", "documentation":"<p>The last known device position. Empty if no positions currently stored.</p>" }, + "Accuracy":{ + "shape":"PositionalAccuracy", + "documentation":"<p>The accuracy of the device position.</p>" + }, "PositionProperties":{ "shape":"PropertyMap", "documentation":"<p>The properties associated with the position.</p>" - }, - "SampleTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp at which the device position was determined. Uses <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>.</p>" } }, "documentation":"<p>Contains the tracker resource details.</p>" @@ -3763,8 +4057,8 @@ "type":"structure", "required":[ "CollectionName", - "CreateTime", "Description", + "CreateTime", "UpdateTime" ], "members":{ @@ -3772,10 +4066,6 @@ "shape":"ResourceName", "documentation":"<p>The name of the geofence collection.</p>" }, - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the geofence collection was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" - }, "Description":{ "shape":"ResourceDescription", "documentation":"<p>The description for the geofence collection</p>" @@ -3792,12 +4082,16 @@ "deprecated":true, "deprecatedMessage":"Deprecated. Unused." }, + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the geofence collection was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" + }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>Specifies a timestamp for when the resource was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" } }, - "documentation":"<p>Contains the geofence collection details.</p>" + "documentation":"<p>Contains the geofence collection details.</p> <note> <p>The returned geometry will always match the geometry format used when the geofence was created.</p> </note>" }, "ListGeofenceCollectionsResponseEntryList":{ "type":"list", @@ -3806,25 +4100,17 @@ "ListGeofenceResponseEntry":{ "type":"structure", "required":[ - "CreateTime", "GeofenceId", "Geometry", "Status", + "CreateTime", "UpdateTime" ], "members":{ - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the geofence was stored in a geofence collection in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" - }, "GeofenceId":{ "shape":"Id", "documentation":"<p>The geofence identifier.</p>" }, - "GeofenceProperties":{ - "shape":"PropertyMap", - "documentation":"<p>User defined properties of the geofence. A property is a key-value pair stored with the geofence and added to any geofence event triggered with that geofence.</p> <p>Format: <code>\"key\" : \"value\"</code> </p>" - }, "Geometry":{ "shape":"GeofenceGeometry", "documentation":"<p>Contains the geofence geometry details describing a polygon or a circle.</p>" @@ -3833,12 +4119,20 @@ "shape":"String", "documentation":"<p>Identifies the state of the geofence. A geofence will hold one of the following states:</p> <ul> <li> <p> <code>ACTIVE</code> — The geofence has been indexed by the system. </p> </li> <li> <p> <code>PENDING</code> — The geofence is being processed by the system.</p> </li> <li> <p> <code>FAILED</code> — The geofence failed to be indexed by the system.</p> </li> <li> <p> <code>DELETED</code> — The geofence has been deleted from the system index.</p> </li> <li> <p> <code>DELETING</code> — The geofence is being deleted from the system index.</p> </li> </ul>" }, + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the geofence was stored in a geofence collection in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" + }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the geofence was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" + }, + "GeofenceProperties":{ + "shape":"PropertyMap", + "documentation":"<p>User defined properties of the geofence. A property is a key-value pair stored with the geofence and added to any geofence event triggered with that geofence.</p> <p>Format: <code>\"key\" : \"value\"</code> </p>" } }, - "documentation":"<p>Contains a list of geofences stored in a given geofence collection.</p>" + "documentation":"<p>Contains a list of geofences stored in a given geofence collection.</p> <note> <p>The returned geometry will always match the geometry format used when the geofence was created.</p> </note>" }, "ListGeofenceResponseEntryList":{ "type":"list", @@ -3854,13 +4148,13 @@ "location":"uri", "locationName":"CollectionName" }, + "NextToken":{ + "shape":"LargeToken", + "documentation":"<p>The pagination token specifying which page of results to return in the response. If no token is provided, the default page is the first page. </p> <p>Default value: <code>null</code> </p>" + }, "MaxResults":{ "shape":"ListGeofencesRequestMaxResultsInteger", "documentation":"<p>An optional limit for the number of geofences returned in a single call. </p> <p>Default value: <code>100</code> </p>" - }, - "NextToken":{ - "shape":"Token", - "documentation":"<p>The pagination token specifying which page of results to return in the response. If no token is provided, the default page is the first page. </p> <p>Default value: <code>null</code> </p>" } } }, @@ -3879,7 +4173,7 @@ "documentation":"<p>Contains a list of geofences stored in the geofence collection.</p>" }, "NextToken":{ - "shape":"Token", + "shape":"LargeToken", "documentation":"<p>A pagination token indicating there are additional pages available. You can use the token in a following request to fetch the next set of results. </p>" } } @@ -3887,10 +4181,6 @@ "ListKeysRequest":{ "type":"structure", "members":{ - "Filter":{ - "shape":"ApiKeyFilter", - "documentation":"<p>Optionally filter the list to only <code>Active</code> or <code>Expired</code> API keys.</p>" - }, "MaxResults":{ "shape":"ListKeysRequestMaxResultsInteger", "documentation":"<p>An optional limit for the number of resources returned in a single call. </p> <p>Default value: <code>100</code> </p>" @@ -3898,6 +4188,10 @@ "NextToken":{ "shape":"Token", "documentation":"<p>The pagination token specifying which page of results to return in the response. If no token is provided, the default page is the first page. </p> <p>Default value: <code>null</code> </p>" + }, + "Filter":{ + "shape":"ApiKeyFilter", + "documentation":"<p>Optionally filter the list to only <code>Active</code> or <code>Expired</code> API keys.</p>" } } }, @@ -3924,30 +4218,30 @@ "ListKeysResponseEntry":{ "type":"structure", "required":[ - "CreateTime", - "ExpireTime", "KeyName", + "ExpireTime", "Restrictions", + "CreateTime", "UpdateTime" ], "members":{ - "CreateTime":{ + "KeyName":{ + "shape":"ResourceName", + "documentation":"<p>The name of the API key resource.</p>" + }, + "ExpireTime":{ "shape":"Timestamp", - "documentation":"<p>The timestamp of when the API key was created, in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>.</p>" + "documentation":"<p>The timestamp for when the API key resource will expire, in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>.</p>" }, "Description":{ "shape":"ResourceDescription", "documentation":"<p>The optional description for the API key resource.</p>" }, - "ExpireTime":{ + "Restrictions":{"shape":"ApiKeyRestrictions"}, + "CreateTime":{ "shape":"Timestamp", - "documentation":"<p>The timestamp for when the API key resource will expire, in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>.</p>" - }, - "KeyName":{ - "shape":"ResourceName", - "documentation":"<p>The name of the API key resource.</p>" + "documentation":"<p>The timestamp of when the API key was created, in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>.</p>" }, - "Restrictions":{"shape":"ApiKeyRestrictions"}, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp of when the API key was last updated, in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>.</p>" @@ -3995,28 +4289,24 @@ "ListMapsResponseEntry":{ "type":"structure", "required":[ - "CreateTime", - "DataSource", - "Description", "MapName", + "Description", + "DataSource", + "CreateTime", "UpdateTime" ], "members":{ - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the map resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>.</p>" - }, - "DataSource":{ - "shape":"String", - "documentation":"<p>Specifies the data provider for the associated map tiles.</p>" + "MapName":{ + "shape":"ResourceName", + "documentation":"<p>The name of the associated map resource.</p>" }, "Description":{ "shape":"ResourceDescription", "documentation":"<p>The description for the map resource.</p>" }, - "MapName":{ - "shape":"ResourceName", - "documentation":"<p>The name of the associated map resource.</p>" + "DataSource":{ + "shape":"String", + "documentation":"<p>Specifies the data provider for the associated map tiles.</p>" }, "PricingPlan":{ "shape":"PricingPlan", @@ -4024,6 +4314,10 @@ "deprecated":true, "deprecatedMessage":"Deprecated. Always returns RequestBasedUsage." }, + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the map resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>.</p>" + }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the map resource was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>.</p>" @@ -4071,28 +4365,24 @@ "ListPlaceIndexesResponseEntry":{ "type":"structure", "required":[ - "CreateTime", - "DataSource", - "Description", "IndexName", + "Description", + "DataSource", + "CreateTime", "UpdateTime" ], "members":{ - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the place index resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" - }, - "DataSource":{ - "shape":"String", - "documentation":"<p>The data provider of geospatial data. Values can be one of the following:</p> <ul> <li> <p> <code>Esri</code> </p> </li> <li> <p> <code>Grab</code> </p> </li> <li> <p> <code>Here</code> </p> </li> </ul> <p>For more information about data providers, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Amazon Location Service data providers</a>.</p>" + "IndexName":{ + "shape":"ResourceName", + "documentation":"<p>The name of the place index resource.</p>" }, "Description":{ "shape":"ResourceDescription", "documentation":"<p>The optional description for the place index resource.</p>" }, - "IndexName":{ - "shape":"ResourceName", - "documentation":"<p>The name of the place index resource.</p>" + "DataSource":{ + "shape":"String", + "documentation":"<p>The data provider of geospatial data. Values can be one of the following:</p> <ul> <li> <p> <code>Esri</code> </p> </li> <li> <p> <code>Grab</code> </p> </li> <li> <p> <code>Here</code> </p> </li> </ul> <p>For more information about data providers, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Amazon Location Service data providers</a>.</p>" }, "PricingPlan":{ "shape":"PricingPlan", @@ -4100,6 +4390,10 @@ "deprecated":true, "deprecatedMessage":"Deprecated. Always returns RequestBasedUsage." }, + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the place index resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the place index resource was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" @@ -4148,9 +4442,9 @@ "type":"structure", "required":[ "CalculatorName", - "CreateTime", - "DataSource", "Description", + "DataSource", + "CreateTime", "UpdateTime" ], "members":{ @@ -4158,24 +4452,24 @@ "shape":"ResourceName", "documentation":"<p>The name of the route calculator resource.</p>" }, - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp when the route calculator resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p> <ul> <li> <p>For example, <code>2020–07-2T12:15:20.000Z+01:00</code> </p> </li> </ul>" + "Description":{ + "shape":"ResourceDescription", + "documentation":"<p>The optional description of the route calculator resource.</p>" }, "DataSource":{ "shape":"String", "documentation":"<p>The data provider of traffic and road network data. Indicates one of the available providers:</p> <ul> <li> <p> <code>Esri</code> </p> </li> <li> <p> <code>Grab</code> </p> </li> <li> <p> <code>Here</code> </p> </li> </ul> <p>For more information about data providers, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Amazon Location Service data providers</a>.</p>" }, - "Description":{ - "shape":"ResourceDescription", - "documentation":"<p>The optional description of the route calculator resource.</p>" - }, "PricingPlan":{ "shape":"PricingPlan", "documentation":"<p>Always returns <code>RequestBasedUsage</code>.</p>", "deprecated":true, "deprecatedMessage":"Deprecated. Always returns RequestBasedUsage." }, + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp when the route calculator resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p> <ul> <li> <p>For example, <code>2020–07-2T12:15:20.000Z+01:00</code> </p> </li> </ul>" + }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp when the route calculator resource was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p> <ul> <li> <p>For example, <code>2020–07-2T12:15:20.000Z+01:00</code> </p> </li> </ul>" @@ -4212,6 +4506,12 @@ "type":"structure", "required":["TrackerName"], "members":{ + "TrackerName":{ + "shape":"ResourceName", + "documentation":"<p>The tracker resource whose associated geofence collections you want to list.</p>", + "location":"uri", + "locationName":"TrackerName" + }, "MaxResults":{ "shape":"ListTrackerConsumersRequestMaxResultsInteger", "documentation":"<p>An optional limit for the number of resources returned in a single call. </p> <p>Default value: <code>100</code> </p>" @@ -4219,12 +4519,6 @@ "NextToken":{ "shape":"Token", "documentation":"<p>The pagination token specifying which page of results to return in the response. If no token is provided, the default page is the first page. </p> <p>Default value: <code>null</code> </p>" - }, - "TrackerName":{ - "shape":"ResourceName", - "documentation":"<p>The tracker resource whose associated geofence collections you want to list.</p>", - "location":"uri", - "locationName":"TrackerName" } } }, @@ -4284,15 +4578,15 @@ "ListTrackersResponseEntry":{ "type":"structure", "required":[ - "CreateTime", - "Description", "TrackerName", + "Description", + "CreateTime", "UpdateTime" ], "members":{ - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the tracker resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + "TrackerName":{ + "shape":"ResourceName", + "documentation":"<p>The name of the tracker resource.</p>" }, "Description":{ "shape":"ResourceDescription", @@ -4310,9 +4604,9 @@ "deprecated":true, "deprecatedMessage":"Deprecated. Unused." }, - "TrackerName":{ - "shape":"ResourceName", - "documentation":"<p>The name of the tracker resource.</p>" + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the tracker resource was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" }, "UpdateTime":{ "shape":"Timestamp", @@ -4325,21 +4619,151 @@ "type":"list", "member":{"shape":"ListTrackersResponseEntry"} }, + "LteCellDetails":{ + "type":"structure", + "required":[ + "CellId", + "Mcc", + "Mnc" + ], + "members":{ + "CellId":{ + "shape":"EutranCellId", + "documentation":"<p>The E-UTRAN Cell Identifier (ECI).</p>" + }, + "Mcc":{ + "shape":"LteCellDetailsMccInteger", + "documentation":"<p>The Mobile Country Code (MCC).</p>" + }, + "Mnc":{ + "shape":"LteCellDetailsMncInteger", + "documentation":"<p>The Mobile Network Code (MNC)</p>" + }, + "LocalId":{ + "shape":"LteLocalId", + "documentation":"<p>The LTE local identification information (local ID).</p>" + }, + "NetworkMeasurements":{ + "shape":"LteCellDetailsNetworkMeasurementsList", + "documentation":"<p>The network measurements.</p>" + }, + "TimingAdvance":{ + "shape":"LteCellDetailsTimingAdvanceInteger", + "documentation":"<p>Timing Advance (TA).</p>" + }, + "NrCapable":{ + "shape":"Boolean", + "documentation":"<p>Indicates whether the LTE object is capable of supporting NR (new radio).</p>" + }, + "Rsrp":{ + "shape":"Rsrp", + "documentation":"<p>Signal power of the reference signal received, measured in decibel-milliwatts (dBm).</p>" + }, + "Rsrq":{ + "shape":"Rsrq", + "documentation":"<p>Signal quality of the reference Signal received, measured in decibels (dB).</p>" + }, + "Tac":{ + "shape":"LteCellDetailsTacInteger", + "documentation":"<p>LTE Tracking Area Code (TAC).</p>" + } + }, + "documentation":"<p>Details about the Long-Term Evolution (LTE) network.</p>" + }, + "LteCellDetailsMccInteger":{ + "type":"integer", + "box":true, + "max":999, + "min":200 + }, + "LteCellDetailsMncInteger":{ + "type":"integer", + "box":true, + "max":999, + "min":0 + }, + "LteCellDetailsNetworkMeasurementsList":{ + "type":"list", + "member":{"shape":"LteNetworkMeasurements"}, + "max":32, + "min":1 + }, + "LteCellDetailsTacInteger":{ + "type":"integer", + "box":true, + "max":65535, + "min":0 + }, + "LteCellDetailsTimingAdvanceInteger":{ + "type":"integer", + "box":true, + "max":1282, + "min":0 + }, + "LteLocalId":{ + "type":"structure", + "required":[ + "Earfcn", + "Pci" + ], + "members":{ + "Earfcn":{ + "shape":"Earfcn", + "documentation":"<p>E-UTRA (Evolved Universal Terrestrial Radio Access) absolute radio frequency channel number (EARFCN).</p>" + }, + "Pci":{ + "shape":"Pci", + "documentation":"<p>Physical Cell ID (PCI).</p>" + } + }, + "documentation":"<p>LTE local identification information (local ID).</p>" + }, + "LteNetworkMeasurements":{ + "type":"structure", + "required":[ + "Earfcn", + "CellId", + "Pci" + ], + "members":{ + "Earfcn":{ + "shape":"Earfcn", + "documentation":"<p>E-UTRA (Evolved Universal Terrestrial Radio Access) absolute radio frequency channel number (EARFCN).</p>" + }, + "CellId":{ + "shape":"EutranCellId", + "documentation":"<p>E-UTRAN Cell Identifier (ECI).</p>" + }, + "Pci":{ + "shape":"Pci", + "documentation":"<p>Physical Cell ID (PCI).</p>" + }, + "Rsrp":{ + "shape":"Rsrp", + "documentation":"<p>Signal power of the reference signal received, measured in dBm (decibel-milliwatts).</p>" + }, + "Rsrq":{ + "shape":"Rsrq", + "documentation":"<p>Signal quality of the reference Signal received, measured in decibels (dB).</p>" + } + }, + "documentation":"<p>LTE network measurements.</p>" + }, "MapConfiguration":{ "type":"structure", "required":["Style"], "members":{ - "CustomLayers":{ - "shape":"CustomLayerList", - "documentation":"<p>Specifies the custom layers for the style. Leave unset to not enable any custom layer, or, for styles that support custom layers, you can enable layer(s), such as <code>POI</code> layer for the VectorEsriNavigation style. Default is <code>unset</code>.</p> <note> <p>Currenlty only <code>VectorEsriNavigation</code> supports CustomLayers. For more information, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/map-concepts.html#map-custom-layers\">Custom Layers</a>.</p> </note>" + "Style":{ + "shape":"MapStyle", + "documentation":"<p>Specifies the map style selected from an available data provider.</p> <p>Valid <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/esri.html\">Esri map styles</a>:</p> <ul> <li> <p> <code>VectorEsriDarkGrayCanvas</code> – The Esri Dark Gray Canvas map style. A vector basemap with a dark gray, neutral background with minimal colors, labels, and features that's designed to draw attention to your thematic content. </p> </li> <li> <p> <code>RasterEsriImagery</code> – The Esri Imagery map style. A raster basemap that provides one meter or better satellite and aerial imagery in many parts of the world and lower resolution satellite imagery worldwide. </p> </li> <li> <p> <code>VectorEsriLightGrayCanvas</code> – The Esri Light Gray Canvas map style, which provides a detailed vector basemap with a light gray, neutral background style with minimal colors, labels, and features that's designed to draw attention to your thematic content. </p> </li> <li> <p> <code>VectorEsriTopographic</code> – The Esri Light map style, which provides a detailed vector basemap with a classic Esri map style.</p> </li> <li> <p> <code>VectorEsriStreets</code> – The Esri Street Map style, which provides a detailed vector basemap for the world symbolized with a classic Esri street map style. The vector tile layer is similar in content and style to the World Street Map raster map.</p> </li> <li> <p> <code>VectorEsriNavigation</code> – The Esri Navigation map style, which provides a detailed basemap for the world symbolized with a custom navigation map style that's designed for use during the day in mobile devices.</p> </li> </ul> <p>Valid <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/HERE.html\">HERE Technologies map styles</a>:</p> <ul> <li> <p> <code>VectorHereContrast</code> – The HERE Contrast (Berlin) map style is a high contrast detailed base map of the world that blends 3D and 2D rendering.</p> <note> <p>The <code>VectorHereContrast</code> style has been renamed from <code>VectorHereBerlin</code>. <code>VectorHereBerlin</code> has been deprecated, but will continue to work in applications that use it.</p> </note> </li> <li> <p> <code>VectorHereExplore</code> – A default HERE map style containing a neutral, global map and its features including roads, buildings, landmarks, and water features. It also now includes a fully designed map of Japan.</p> </li> <li> <p> <code>VectorHereExploreTruck</code> – A global map containing truck restrictions and attributes (e.g. width / height / HAZMAT) symbolized with highlighted segments and icons on top of HERE Explore to support use cases within transport and logistics.</p> </li> <li> <p> <code>RasterHereExploreSatellite</code> – A global map containing high resolution satellite imagery.</p> </li> <li> <p> <code>HybridHereExploreSatellite</code> – A global map displaying the road network, street names, and city labels over satellite imagery. This style will automatically retrieve both raster and vector tiles, and your charges will be based on total tiles retrieved.</p> <note> <p>Hybrid styles use both vector and raster tiles when rendering the map that you see. This means that more tiles are retrieved than when using either vector or raster tiles alone. Your charges will include all tiles retrieved.</p> </note> </li> </ul> <p>Valid <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html\">GrabMaps map styles</a>:</p> <ul> <li> <p> <code>VectorGrabStandardLight</code> – The Grab Standard Light map style provides a basemap with detailed land use coloring, area names, roads, landmarks, and points of interest covering Southeast Asia.</p> </li> <li> <p> <code>VectorGrabStandardDark</code> – The Grab Standard Dark map style provides a dark variation of the standard basemap covering Southeast Asia.</p> </li> </ul> <note> <p>Grab provides maps only for countries in Southeast Asia, and is only available in the Asia Pacific (Singapore) Region (<code>ap-southeast-1</code>). For more information, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html#grab-coverage-area\">GrabMaps countries and area covered</a>.</p> </note> <p>Valid <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/open-data.html\">Open Data map styles</a>:</p> <ul> <li> <p> <code>VectorOpenDataStandardLight</code> – The Open Data Standard Light map style provides a detailed basemap for the world suitable for website and mobile application use. The map includes highways major roads, minor roads, railways, water features, cities, parks, landmarks, building footprints, and administrative boundaries.</p> </li> <li> <p> <code>VectorOpenDataStandardDark</code> – Open Data Standard Dark is a dark-themed map style that provides a detailed basemap for the world suitable for website and mobile application use. The map includes highways major roads, minor roads, railways, water features, cities, parks, landmarks, building footprints, and administrative boundaries.</p> </li> <li> <p> <code>VectorOpenDataVisualizationLight</code> – The Open Data Visualization Light map style is a light-themed style with muted colors and fewer features that aids in understanding overlaid data.</p> </li> <li> <p> <code>VectorOpenDataVisualizationDark</code> – The Open Data Visualization Dark map style is a dark-themed style with muted colors and fewer features that aids in understanding overlaid data.</p> </li> </ul>" }, "PoliticalView":{ "shape":"CountryCode3", "documentation":"<p>Specifies the political view for the style. Leave unset to not use a political view, or, for styles that support specific political views, you can choose a view, such as <code>IND</code> for the Indian view.</p> <p>Default is unset.</p> <note> <p>Not all map resources or styles support political view styles. See <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/map-concepts.html#political-views\">Political views</a> for more information.</p> </note>" }, - "Style":{ - "shape":"MapStyle", - "documentation":"<p>Specifies the map style selected from an available data provider.</p> <p>Valid <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/esri.html\">Esri map styles</a>:</p> <ul> <li> <p> <code>VectorEsriNavigation</code> – The Esri Navigation map style, which provides a detailed basemap for the world symbolized with a custom navigation map style that's designed for use during the day in mobile devices. It also includes a richer set of places, such as shops, services, restaurants, attractions, and other points of interest. Enable the <code>POI</code> layer by setting it in CustomLayers to leverage the additional places data.</p> <p/> </li> <li> <p> <code>RasterEsriImagery</code> – The Esri Imagery map style. A raster basemap that provides one meter or better satellite and aerial imagery in many parts of the world and lower resolution satellite imagery worldwide. </p> </li> <li> <p> <code>VectorEsriLightGrayCanvas</code> – The Esri Light Gray Canvas map style, which provides a detailed vector basemap with a light gray, neutral background style with minimal colors, labels, and features that's designed to draw attention to your thematic content. </p> </li> <li> <p> <code>VectorEsriTopographic</code> – The Esri Light map style, which provides a detailed vector basemap with a classic Esri map style.</p> </li> <li> <p> <code>VectorEsriStreets</code> – The Esri Street Map style, which provides a detailed vector basemap for the world symbolized with a classic Esri street map style. The vector tile layer is similar in content and style to the World Street Map raster map.</p> </li> <li> <p> <code>VectorEsriDarkGrayCanvas</code> – The Esri Dark Gray Canvas map style. A vector basemap with a dark gray, neutral background with minimal colors, labels, and features that's designed to draw attention to your thematic content. </p> </li> </ul> <p>Valid <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/HERE.html\">HERE Technologies map styles</a>:</p> <ul> <li> <p> <code>VectorHereExplore</code> – A default HERE map style containing a neutral, global map and its features including roads, buildings, landmarks, and water features. It also now includes a fully designed map of Japan.</p> </li> <li> <p> <code>RasterHereExploreSatellite</code> – A global map containing high resolution satellite imagery.</p> </li> <li> <p> <code>HybridHereExploreSatellite</code> – A global map displaying the road network, street names, and city labels over satellite imagery. This style will automatically retrieve both raster and vector tiles, and your charges will be based on total tiles retrieved.</p> <note> <p>Hybrid styles use both vector and raster tiles when rendering the map that you see. This means that more tiles are retrieved than when using either vector or raster tiles alone. Your charges will include all tiles retrieved.</p> </note> </li> <li> <p> <code>VectorHereContrast</code> – The HERE Contrast (Berlin) map style is a high contrast detailed base map of the world that blends 3D and 2D rendering.</p> <note> <p>The <code>VectorHereContrast</code> style has been renamed from <code>VectorHereBerlin</code>. <code>VectorHereBerlin</code> has been deprecated, but will continue to work in applications that use it.</p> </note> </li> <li> <p> <code>VectorHereExploreTruck</code> – A global map containing truck restrictions and attributes (e.g. width / height / HAZMAT) symbolized with highlighted segments and icons on top of HERE Explore to support use cases within transport and logistics.</p> </li> </ul> <p>Valid <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html\">GrabMaps map styles</a>:</p> <ul> <li> <p> <code>VectorGrabStandardLight</code> – The Grab Standard Light map style provides a basemap with detailed land use coloring, area names, roads, landmarks, and points of interest covering Southeast Asia.</p> </li> <li> <p> <code>VectorGrabStandardDark</code> – The Grab Standard Dark map style provides a dark variation of the standard basemap covering Southeast Asia.</p> </li> </ul> <note> <p>Grab provides maps only for countries in Southeast Asia, and is only available in the Asia Pacific (Singapore) Region (<code>ap-southeast-1</code>). For more information, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/grab.html#grab-coverage-area\">GrabMaps countries and area covered</a>.</p> </note> <p>Valid <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/open-data.html\">Open Data map styles</a>:</p> <ul> <li> <p> <code>VectorOpenDataStandardLight</code> – The Open Data Standard Light map style provides a detailed basemap for the world suitable for website and mobile application use. The map includes highways major roads, minor roads, railways, water features, cities, parks, landmarks, building footprints, and administrative boundaries.</p> </li> <li> <p> <code>VectorOpenDataStandardDark</code> – Open Data Standard Dark is a dark-themed map style that provides a detailed basemap for the world suitable for website and mobile application use. The map includes highways major roads, minor roads, railways, water features, cities, parks, landmarks, building footprints, and administrative boundaries.</p> </li> <li> <p> <code>VectorOpenDataVisualizationLight</code> – The Open Data Visualization Light map style is a light-themed style with muted colors and fewer features that aids in understanding overlaid data.</p> </li> <li> <p> <code>VectorOpenDataVisualizationDark</code> – The Open Data Visualization Dark map style is a dark-themed style with muted colors and fewer features that aids in understanding overlaid data.</p> </li> </ul>" + "CustomLayers":{ + "shape":"CustomLayerList", + "documentation":"<p>Specifies the custom layers for the style. Leave unset to not enable any custom layer, or, for styles that support custom layers, you can enable layer(s), such as POI layer for the VectorEsriNavigation style. Default is <code>unset</code>.</p> <note> <p>Not all map resources or styles support custom layers. See Custom Layers for more information.</p> </note>" } }, "documentation":"<p>Specifies the map tile style selected from an available provider.</p>" @@ -4347,13 +4771,13 @@ "MapConfigurationUpdate":{ "type":"structure", "members":{ - "CustomLayers":{ - "shape":"CustomLayerList", - "documentation":"<p>Specifies the custom layers for the style. Leave unset to not enable any custom layer, or, for styles that support custom layers, you can enable layer(s), such as <code>POI</code> layer for the VectorEsriNavigation style. Default is <code>unset</code>.</p> <note> <p>Currenlty only <code>VectorEsriNavigation</code> supports CustomLayers. For more information, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/map-concepts.html#map-custom-layers\">Custom Layers</a>.</p> </note>" - }, "PoliticalView":{ "shape":"CountryCode3OrEmpty", "documentation":"<p>Specifies the political view for the style. Set to an empty string to not use a political view, or, for styles that support specific political views, you can choose a view, such as <code>IND</code> for the Indian view.</p> <note> <p>Not all map resources or styles support political view styles. See <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/map-concepts.html#political-views\">Political views</a> for more information.</p> </note>" + }, + "CustomLayers":{ + "shape":"CustomLayerList", + "documentation":"<p>Specifies the custom layers for the style. Leave unset to not enable any custom layer, or, for styles that support custom layers, you can enable layer(s), such as POI layer for the VectorEsriNavigation style. Default is <code>unset</code>.</p> <note> <p>Not all map resources or styles support custom layers. See Custom Layers for more information.</p> </note>" } }, "documentation":"<p>Specifies the political view for the style.</p>" @@ -4362,7 +4786,11 @@ "type":"string", "max":100, "min":1, - "pattern":"^[-._\\w]+$" + "pattern":"[-._\\w]+" + }, + "NearestDistance":{ + "type":"double", + "min":0 }, "OptimizationMode":{ "type":"string", @@ -4371,74 +4799,79 @@ "ShortestRoute" ] }, + "Pci":{ + "type":"integer", + "max":503, + "min":0 + }, "Place":{ "type":"structure", "required":["Geometry"], "members":{ + "Label":{ + "shape":"String", + "documentation":"<p>The full name and address of the point of interest such as a city, region, or country. For example, <code>123 Any Street, Any Town, USA</code>.</p>" + }, + "Geometry":{"shape":"PlaceGeometry"}, "AddressNumber":{ "shape":"String", "documentation":"<p>The numerical portion of an address, such as a building number. </p>" }, - "Categories":{ - "shape":"PlaceCategoryList", - "documentation":"<p>The Amazon Location categories that describe this Place.</p> <p>For more information about using categories, including a list of Amazon Location categories, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/category-filtering.html\">Categories and filtering</a>, in the <i>Amazon Location Service Developer Guide</i>.</p>" - }, - "Country":{ + "Street":{ "shape":"String", - "documentation":"<p>A country/region specified using <a href=\"https://www.iso.org/iso-3166-country-codes.html\">ISO 3166</a> 3-digit country/region code. For example, <code>CAN</code>.</p>" - }, - "Geometry":{"shape":"PlaceGeometry"}, - "Interpolated":{ - "shape":"Boolean", - "documentation":"<p> <code>True</code> if the result is interpolated from other known places.</p> <p> <code>False</code> if the Place is a known place.</p> <p>Not returned when the partner does not provide the information.</p> <p>For example, returns <code>False</code> for an address location that is found in the partner data, but returns <code>True</code> if an address does not exist in the partner data and its location is calculated by interpolating between other known addresses. </p>" + "documentation":"<p>The name for a street or a road to identify a location. For example, <code>Main Street</code>.</p>" }, - "Label":{ + "Neighborhood":{ "shape":"String", - "documentation":"<p>The full name and address of the point of interest such as a city, region, or country. For example, <code>123 Any Street, Any Town, USA</code>.</p>" + "documentation":"<p>The name of a community district. For example, <code>Downtown</code>.</p>" }, "Municipality":{ "shape":"String", "documentation":"<p>A name for a local area, such as a city or town name. For example, <code>Toronto</code>.</p>" }, - "Neighborhood":{ - "shape":"String", - "documentation":"<p>The name of a community district. For example, <code>Downtown</code>.</p>" - }, - "PostalCode":{ + "SubRegion":{ "shape":"String", - "documentation":"<p>A group of numbers and letters in a country-specific format, which accompanies the address for the purpose of identifying a location. </p>" + "documentation":"<p>A county, or an area that's part of a larger region. For example, <code>Metro Vancouver</code>.</p>" }, "Region":{ "shape":"String", "documentation":"<p>A name for an area or geographical division, such as a province or state name. For example, <code>British Columbia</code>.</p>" }, - "Street":{ - "shape":"String", - "documentation":"<p>The name for a street or a road to identify a location. For example, <code>Main Street</code>.</p>" - }, - "SubMunicipality":{ + "Country":{ "shape":"String", - "documentation":"<p>An area that's part of a larger municipality. For example, <code>Blissville</code> is a submunicipality in the Queen County in New York.</p> <note> <p>This property is only returned for a place index that uses Esri as a data provider. The property is represented as a <code>district</code>.</p> </note> <p>For more information about data providers, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Amazon Location Service data providers</a>.</p>" + "documentation":"<p>A country/region specified using <a href=\"https://www.iso.org/iso-3166-country-codes.html\">ISO 3166</a> 3-digit country/region code. For example, <code>CAN</code>.</p>" }, - "SubRegion":{ + "PostalCode":{ "shape":"String", - "documentation":"<p>A county, or an area that's part of a larger region. For example, <code>Metro Vancouver</code>.</p>" + "documentation":"<p>A group of numbers and letters in a country-specific format, which accompanies the address for the purpose of identifying a location. </p>" }, - "SupplementalCategories":{ - "shape":"PlaceSupplementalCategoryList", - "documentation":"<p>Categories from the data provider that describe the Place that are not mapped to any Amazon Location categories.</p>" + "Interpolated":{ + "shape":"Boolean", + "documentation":"<p> <code>True</code> if the result is interpolated from other known places.</p> <p> <code>False</code> if the Place is a known place.</p> <p>Not returned when the partner does not provide the information.</p> <p>For example, returns <code>False</code> for an address location that is found in the partner data, but returns <code>True</code> if an address does not exist in the partner data and its location is calculated by interpolating between other known addresses. </p>" }, "TimeZone":{ "shape":"TimeZone", "documentation":"<p>The time zone in which the <code>Place</code> is located. Returned only when using HERE or Grab as the selected partner.</p>" }, + "UnitType":{ + "shape":"String", + "documentation":"<p>For addresses with a <code>UnitNumber</code>, the type of unit. For example, <code>Apartment</code>.</p> <note> <p>Returned only for a place index that uses Esri as a data provider.</p> </note>" + }, "UnitNumber":{ "shape":"String", - "documentation":"<p>For addresses with multiple units, the unit identifier. Can include numbers and letters, for example <code>3B</code> or <code>Unit 123</code>.</p> <note> <p>This property is returned only for a place index that uses Esri or Grab as a data provider. It is not returned for <code>SearchPlaceIndexForPosition</code>.</p> </note>" + "documentation":"<p>For addresses with multiple units, the unit identifier. Can include numbers and letters, for example <code>3B</code> or <code>Unit 123</code>.</p> <note> <p>Returned only for a place index that uses Esri or Grab as a data provider. Is not returned for <code>SearchPlaceIndexForPosition</code>.</p> </note>" }, - "UnitType":{ + "Categories":{ + "shape":"PlaceCategoryList", + "documentation":"<p>The Amazon Location categories that describe this Place.</p> <p>For more information about using categories, including a list of Amazon Location categories, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/category-filtering.html\">Categories and filtering</a>, in the <i>Amazon Location Service Developer Guide</i>.</p>" + }, + "SupplementalCategories":{ + "shape":"PlaceSupplementalCategoryList", + "documentation":"<p>Categories from the data provider that describe the Place that are not mapped to any Amazon Location categories.</p>" + }, + "SubMunicipality":{ "shape":"String", - "documentation":"<p>For addresses with a <code>UnitNumber</code>, the type of unit. For example, <code>Apartment</code>.</p> <note> <p>This property is returned only for a place index that uses Esri as a data provider.</p> </note>" + "documentation":"<p>An area that's part of a larger municipality. For example, <code>Blissville </code> is a submunicipality in the Queen County in New York.</p> <note> <p>This property supported by Esri and OpenData. The Esri property is <code>district</code>, and the OpenData property is <code>borough</code>.</p> </note>" } }, "documentation":"<p>Contains details about addresses or points of interest that match the search criteria.</p> <p>Not all details are included with all responses. Some details may only be returned by specific data partners.</p>" @@ -4511,7 +4944,7 @@ "PositionalAccuracyHorizontalDouble":{ "type":"double", "box":true, - "max":10000, + "max":10000000, "min":0 }, "PricingPlan":{ @@ -4560,32 +4993,32 @@ "location":"uri", "locationName":"GeofenceId" }, + "Geometry":{ + "shape":"GeofenceGeometry", + "documentation":"<p>Contains the details to specify the position of the geofence. Can be a polygon, a circle or a polygon encoded in Geobuf format. Including multiple selections will return a validation error.</p> <note> <p>The <a href=\"https://docs.aws.amazon.com/location-geofences/latest/APIReference/API_GeofenceGeometry.html\"> geofence polygon</a> format supports a maximum of 1,000 vertices. The <a href=\"https://docs.aws.amazon.com/location-geofences/latest/APIReference/API_GeofenceGeometry.html\">Geofence Geobuf</a> format supports a maximum of 100,000 vertices.</p> </note>" + }, "GeofenceProperties":{ "shape":"PropertyMap", "documentation":"<p>Associates one of more properties with the geofence. A property is a key-value pair stored with the geofence and added to any geofence event triggered with that geofence.</p> <p>Format: <code>\"key\" : \"value\"</code> </p>" - }, - "Geometry":{ - "shape":"GeofenceGeometry", - "documentation":"<p>Contains the details to specify the position of the geofence. Can be either a polygon or a circle. Including both will return a validation error.</p> <note> <p>Each <a href=\"https://docs.aws.amazon.com/location-geofences/latest/APIReference/API_GeofenceGeometry.html\"> geofence polygon</a> can have a maximum of 1,000 vertices.</p> </note>" } } }, "PutGeofenceResponse":{ "type":"structure", "required":[ - "CreateTime", "GeofenceId", + "CreateTime", "UpdateTime" ], "members":{ - "CreateTime":{ - "shape":"Timestamp", - "documentation":"<p>The timestamp for when the geofence was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" - }, "GeofenceId":{ "shape":"Id", "documentation":"<p>The geofence identifier entered in the request.</p>" }, + "CreateTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the geofence was created in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" + }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the geofence was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" @@ -4596,7 +5029,7 @@ "type":"string", "max":253, "min":0, - "pattern":"^([$\\-._+!*\\x{60}(),;/?:@=&\\w]|%([0-9a-fA-F?]{2}|[0-9a-fA-F?]?[*]))+$" + "pattern":"([$\\-._+!*\\x{60}(),;/?:@=&\\w]|%([0-9a-fA-F?]{2}|[0-9a-fA-F?]?[*]))+" }, "ResourceDescription":{ "type":"string", @@ -4607,7 +5040,7 @@ "type":"string", "max":100, "min":1, - "pattern":"^[-._\\w]+$" + "pattern":"[-._\\w]+" }, "ResourceNotFoundException":{ "type":"structure", @@ -4687,21 +5120,33 @@ "type":"list", "member":{"shape":"RouteMatrixEntry"} }, + "Rsrp":{ + "type":"integer", + "box":true, + "max":-44, + "min":-140 + }, + "Rsrq":{ + "type":"float", + "box":true, + "max":-3, + "min":-19.5 + }, "SearchForPositionResult":{ "type":"structure", "required":[ - "Distance", - "Place" + "Place", + "Distance" ], "members":{ - "Distance":{ - "shape":"SearchForPositionResultDistanceDouble", - "documentation":"<p>The distance in meters of a great-circle arc between the query position and the result.</p> <note> <p>A great-circle arc is the shortest path on a sphere, in this case the Earth. This returns the shortest distance between two locations.</p> </note>" - }, "Place":{ "shape":"Place", "documentation":"<p>Details about the search result, such as its address and position.</p>" }, + "Distance":{ + "shape":"SearchForPositionResultDistanceDouble", + "documentation":"<p>The distance in meters of a great-circle arc between the query position and the result.</p> <note> <p>A great-circle arc is the shortest path on a sphere, in this case the Earth. This returns the shortest distance between two locations.</p> </note>" + }, "PlaceId":{ "shape":"PlaceId", "documentation":"<p>The unique identifier of the place. You can use this with the <code>GetPlace</code> operation to find the place again later.</p> <note> <p>For <code>SearchPlaceIndexForPosition</code> operations, the <code>PlaceId</code> is returned only by place indexes that use HERE or Grab as a data provider.</p> </note>" @@ -4722,21 +5167,21 @@ "type":"structure", "required":["Text"], "members":{ - "Categories":{ - "shape":"PlaceCategoryList", - "documentation":"<p>The Amazon Location categories that describe the Place.</p> <p>For more information about using categories, including a list of Amazon Location categories, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/category-filtering.html\">Categories and filtering</a>, in the <i>Amazon Location Service Developer Guide</i>.</p>" + "Text":{ + "shape":"String", + "documentation":"<p>The text of the place suggestion, typically formatted as an address string.</p>" }, "PlaceId":{ "shape":"PlaceId", - "documentation":"<p>The unique identifier of the Place. You can use this with the <code>GetPlace</code> operation to find the place again later, or to get full information for the Place.</p> <p>The <code>GetPlace</code> request must use the same <code>PlaceIndex</code> resource as the <code>SearchPlaceIndexForSuggestions</code> that generated the Place ID.</p> <note> <p>For <code>SearchPlaceIndexForSuggestions</code> operations, the <code>PlaceId</code> is returned by place indexes that use Esri, Grab, or HERE as data providers.</p> </note> <p>While you can use PlaceID in subsequent requests, PlaceID is not intended to be a permanent identifier and the ID can change between consecutive API calls. Please see the following PlaceID behaviour for each data provider:</p> <ul> <li> <p>Esri: Place IDs will change every quarter at a minimum. The typical time period for these changes would be March, June, September, and December. Place IDs might also change between the typical quarterly change but that will be much less frequent.</p> </li> <li> <p>HERE: We recommend that you cache data for no longer than a week to keep your data data fresh. You can assume that less than 1% ID shifts will release over release which is approximately 1 - 2 times per week.</p> </li> <li> <p>Grab: Place IDs can expire or become invalid in the following situations.</p> <ul> <li> <p>Data operations: The POI may be removed from Grab POI database by Grab Map Ops based on the ground-truth, such as being closed in the real world, being detected as a duplicate POI, or having incorrect information. Grab will synchronize data to the Waypoint environment on weekly basis.</p> </li> <li> <p>Interpolated POI: Interpolated POI is a temporary POI generated in real time when serving a request, and it will be marked as derived in the <code>place.result_type</code> field in the response. The information of interpolated POIs will be retained for at least 30 days, which means that within 30 days, you are able to obtain POI details by Place ID from Place Details API. After 30 days, the interpolated POIs(both Place ID and details) may expire and inaccessible from the Places Details API.</p> </li> </ul> </li> </ul>" + "documentation":"<p>The unique identifier of the Place. You can use this with the <code>GetPlace</code> operation to find the place again later, or to get full information for the Place.</p> <p>The <code>GetPlace</code> request must use the same <code>PlaceIndex</code> resource as the <code>SearchPlaceIndexForSuggestions</code> that generated the Place ID.</p> <note> <p>For <code>SearchPlaceIndexForSuggestions</code> operations, the <code>PlaceId</code> is returned by place indexes that use Esri, Grab, or HERE as data providers.</p> </note>" + }, + "Categories":{ + "shape":"PlaceCategoryList", + "documentation":"<p>The Amazon Location categories that describe the Place.</p> <p>For more information about using categories, including a list of Amazon Location categories, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/category-filtering.html\">Categories and filtering</a>, in the <i>Amazon Location Service Developer Guide</i>.</p>" }, "SupplementalCategories":{ "shape":"PlaceSupplementalCategoryList", "documentation":"<p>Categories from the data provider that describe the Place that are not mapped to any Amazon Location categories.</p>" - }, - "Text":{ - "shape":"String", - "documentation":"<p>The text of the place suggestion, typically formatted as an address string.</p>" } }, "documentation":"<p>Contains a place suggestion resulting from a place suggestion query that is run on a place index resource.</p>" @@ -4747,23 +5192,23 @@ }, "SearchForTextResult":{ "type":"structure", - "required":["Place"], - "members":{ - "Distance":{ - "shape":"SearchForTextResultDistanceDouble", - "documentation":"<p>The distance in meters of a great-circle arc between the bias position specified and the result. <code>Distance</code> will be returned only if a bias position was specified in the query.</p> <note> <p>A great-circle arc is the shortest path on a sphere, in this case the Earth. This returns the shortest distance between two locations.</p> </note>" - }, + "required":["Place"], + "members":{ "Place":{ "shape":"Place", "documentation":"<p>Details about the search result, such as its address and position.</p>" }, - "PlaceId":{ - "shape":"PlaceId", - "documentation":"<p>The unique identifier of the place. You can use this with the <code>GetPlace</code> operation to find the place again later.</p> <note> <p>For <code>SearchPlaceIndexForText</code> operations, the <code>PlaceId</code> is returned only by place indexes that use HERE or Grab as a data provider.</p> </note>" + "Distance":{ + "shape":"SearchForTextResultDistanceDouble", + "documentation":"<p>The distance in meters of a great-circle arc between the bias position specified and the result. <code>Distance</code> will be returned only if a bias position was specified in the query.</p> <note> <p>A great-circle arc is the shortest path on a sphere, in this case the Earth. This returns the shortest distance between two locations.</p> </note>" }, "Relevance":{ "shape":"SearchForTextResultRelevanceDouble", "documentation":"<p>The relative confidence in the match for a result among the results returned. For example, if more fields for an address match (including house number, street, city, country/region, and postal code), the relevance score is closer to 1.</p> <p>Returned only when the partner selected is Esri or Grab.</p>" + }, + "PlaceId":{ + "shape":"PlaceId", + "documentation":"<p>The unique identifier of the place. You can use this with the <code>GetPlace</code> operation to find the place again later.</p> <note> <p>For <code>SearchPlaceIndexForText</code> operations, the <code>PlaceId</code> is returned only by place indexes that use HERE or Grab as a data provider.</p> </note>" } }, "documentation":"<p>Contains a search result from a text search query that is run on a place index resource.</p>" @@ -4796,50 +5241,58 @@ "location":"uri", "locationName":"IndexName" }, - "Key":{ - "shape":"ApiKey", - "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", - "location":"querystring", - "locationName":"key" - }, - "Language":{ - "shape":"LanguageTag", - "documentation":"<p>The preferred language used to return results. The value must be a valid <a href=\"https://tools.ietf.org/search/bcp47\">BCP 47</a> language tag, for example, <code>en</code> for English.</p> <p>This setting affects the languages used in the results, but not the results themselves. If no language is specified, or not supported for a particular result, the partner automatically chooses a language for the result.</p> <p>For an example, we'll use the Greek language. You search for a location around Athens, Greece, with the <code>language</code> parameter set to <code>en</code>. The <code>city</code> in the results will most likely be returned as <code>Athens</code>.</p> <p>If you set the <code>language</code> parameter to <code>el</code>, for Greek, then the <code>city</code> in the results will more likely be returned as <code>Αθήνα</code>.</p> <p>If the data provider does not have a value for Greek, the result will be in a language that the provider does support.</p>" + "Position":{ + "shape":"Position", + "documentation":"<p>Specifies the longitude and latitude of the position to query.</p> <p> This parameter must contain a pair of numbers. The first number represents the X coordinate, or longitude; the second number represents the Y coordinate, or latitude.</p> <p>For example, <code>[-123.1174, 49.2847]</code> represents a position with longitude <code>-123.1174</code> and latitude <code>49.2847</code>.</p>" }, "MaxResults":{ "shape":"PlaceIndexSearchResultLimit", "documentation":"<p>An optional parameter. The maximum number of results returned per request.</p> <p>Default value: <code>50</code> </p>" }, - "Position":{ - "shape":"Position", - "documentation":"<p>Specifies the longitude and latitude of the position to query.</p> <p> This parameter must contain a pair of numbers. The first number represents the X coordinate, or longitude; the second number represents the Y coordinate, or latitude.</p> <p>For example, <code>[-123.1174, 49.2847]</code> represents a position with longitude <code>-123.1174</code> and latitude <code>49.2847</code>.</p>" + "Language":{ + "shape":"LanguageTag", + "documentation":"<p>The preferred language used to return results. The value must be a valid <a href=\"https://tools.ietf.org/search/bcp47\">BCP 47</a> language tag, for example, <code>en</code> for English.</p> <p>This setting affects the languages used in the results, but not the results themselves. If no language is specified, or not supported for a particular result, the partner automatically chooses a language for the result.</p> <p>For an example, we'll use the Greek language. You search for a location around Athens, Greece, with the <code>language</code> parameter set to <code>en</code>. The <code>city</code> in the results will most likely be returned as <code>Athens</code>.</p> <p>If you set the <code>language</code> parameter to <code>el</code>, for Greek, then the <code>city</code> in the results will more likely be returned as <code>Αθήνα</code>.</p> <p>If the data provider does not have a value for Greek, the result will be in a language that the provider does support.</p>" + }, + "Key":{ + "shape":"ApiKey", + "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", + "location":"querystring", + "locationName":"key" } } }, "SearchPlaceIndexForPositionResponse":{ "type":"structure", "required":[ - "Results", - "Summary" + "Summary", + "Results" ], "members":{ - "Results":{ - "shape":"SearchForPositionResultList", - "documentation":"<p>Returns a list of Places closest to the specified position. Each result contains additional information about the Places returned.</p>" - }, "Summary":{ "shape":"SearchPlaceIndexForPositionSummary", "documentation":"<p>Contains a summary of the request. Echoes the input values for <code>Position</code>, <code>Language</code>, <code>MaxResults</code>, and the <code>DataSource</code> of the place index. </p>" + }, + "Results":{ + "shape":"SearchForPositionResultList", + "documentation":"<p>Returns a list of Places closest to the specified position. Each result contains additional information about the Places returned.</p>" } } }, "SearchPlaceIndexForPositionSummary":{ "type":"structure", "required":[ - "DataSource", - "Position" + "Position", + "DataSource" ], "members":{ + "Position":{ + "shape":"Position", + "documentation":"<p>The position specified in the request.</p>" + }, + "MaxResults":{ + "shape":"PlaceIndexSearchResultLimit", + "documentation":"<p>Contains the optional result count limit that is specified in the request.</p> <p>Default value: <code>50</code> </p>" + }, "DataSource":{ "shape":"String", "documentation":"<p>The geospatial data provider attached to the place index resource specified in the request. Values can be one of the following:</p> <ul> <li> <p>Esri</p> </li> <li> <p>Grab</p> </li> <li> <p>Here</p> </li> </ul> <p>For more information about data providers, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Amazon Location Service data providers</a>.</p>" @@ -4847,14 +5300,6 @@ "Language":{ "shape":"LanguageTag", "documentation":"<p>The preferred language used to return results. Matches the language in the request. The value is a valid <a href=\"https://tools.ietf.org/search/bcp47\">BCP 47</a> language tag, for example, <code>en</code> for English.</p>" - }, - "MaxResults":{ - "shape":"PlaceIndexSearchResultLimit", - "documentation":"<p>Contains the optional result count limit that is specified in the request.</p> <p>Default value: <code>50</code> </p>" - }, - "Position":{ - "shape":"Position", - "documentation":"<p>The position specified in the request.</p>" } }, "documentation":"<p>A summary of the request sent by using <code>SearchPlaceIndexForPosition</code>.</p>" @@ -4866,6 +5311,16 @@ "Text" ], "members":{ + "IndexName":{ + "shape":"ResourceName", + "documentation":"<p>The name of the place index resource you want to use for the search.</p>", + "location":"uri", + "locationName":"IndexName" + }, + "Text":{ + "shape":"SearchPlaceIndexForSuggestionsRequestTextString", + "documentation":"<p>The free-form partial text to use to generate place suggestions. For example, <code>eiffel tow</code>.</p>" + }, "BiasPosition":{ "shape":"Position", "documentation":"<p>An optional parameter that indicates a preference for place suggestions that are closer to a specified position.</p> <p> If provided, this parameter must contain a pair of numbers. The first number represents the X coordinate, or longitude; the second number represents the Y coordinate, or latitude.</p> <p>For example, <code>[-123.1174, 49.2847]</code> represents the position with longitude <code>-123.1174</code> and latitude <code>49.2847</code>.</p> <note> <p> <code>BiasPosition</code> and <code>FilterBBox</code> are mutually exclusive. Specifying both options results in an error. </p> </note>" @@ -4874,37 +5329,27 @@ "shape":"BoundingBox", "documentation":"<p>An optional parameter that limits the search results by returning only suggestions within a specified bounding box.</p> <p> If provided, this parameter must contain a total of four consecutive numbers in two pairs. The first pair of numbers represents the X and Y coordinates (longitude and latitude, respectively) of the southwest corner of the bounding box; the second pair of numbers represents the X and Y coordinates (longitude and latitude, respectively) of the northeast corner of the bounding box.</p> <p>For example, <code>[-12.7935, -37.4835, -12.0684, -36.9542]</code> represents a bounding box where the southwest corner has longitude <code>-12.7935</code> and latitude <code>-37.4835</code>, and the northeast corner has longitude <code>-12.0684</code> and latitude <code>-36.9542</code>.</p> <note> <p> <code>FilterBBox</code> and <code>BiasPosition</code> are mutually exclusive. Specifying both options results in an error. </p> </note>" }, - "FilterCategories":{ - "shape":"FilterPlaceCategoryList", - "documentation":"<p>A list of one or more Amazon Location categories to filter the returned places. If you include more than one category, the results will include results that match <i>any</i> of the categories listed.</p> <p>For more information about using categories, including a list of Amazon Location categories, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/category-filtering.html\">Categories and filtering</a>, in the <i>Amazon Location Service Developer Guide</i>.</p>" - }, "FilterCountries":{ "shape":"CountryCodeList", "documentation":"<p>An optional parameter that limits the search results by returning only suggestions within the provided list of countries.</p> <ul> <li> <p>Use the <a href=\"https://www.iso.org/iso-3166-country-codes.html\">ISO 3166</a> 3-digit country code. For example, Australia uses three upper-case characters: <code>AUS</code>.</p> </li> </ul>" }, - "IndexName":{ - "shape":"ResourceName", - "documentation":"<p>The name of the place index resource you want to use for the search.</p>", - "location":"uri", - "locationName":"IndexName" - }, - "Key":{ - "shape":"ApiKey", - "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", - "location":"querystring", - "locationName":"key" + "MaxResults":{ + "shape":"SearchPlaceIndexForSuggestionsRequestMaxResultsInteger", + "documentation":"<p>An optional parameter. The maximum number of results returned per request. </p> <p>The default: <code>5</code> </p>" }, "Language":{ "shape":"LanguageTag", "documentation":"<p>The preferred language used to return results. The value must be a valid <a href=\"https://tools.ietf.org/search/bcp47\">BCP 47</a> language tag, for example, <code>en</code> for English.</p> <p>This setting affects the languages used in the results. If no language is specified, or not supported for a particular result, the partner automatically chooses a language for the result.</p> <p>For an example, we'll use the Greek language. You search for <code>Athens, Gr</code> to get suggestions with the <code>language</code> parameter set to <code>en</code>. The results found will most likely be returned as <code>Athens, Greece</code>.</p> <p>If you set the <code>language</code> parameter to <code>el</code>, for Greek, then the result found will more likely be returned as <code>Αθήνα, Ελλάδα</code>.</p> <p>If the data provider does not have a value for Greek, the result will be in a language that the provider does support.</p>" }, - "MaxResults":{ - "shape":"SearchPlaceIndexForSuggestionsRequestMaxResultsInteger", - "documentation":"<p>An optional parameter. The maximum number of results returned per request. </p> <p>The default: <code>5</code> </p>" + "FilterCategories":{ + "shape":"FilterPlaceCategoryList", + "documentation":"<p>A list of one or more Amazon Location categories to filter the returned places. If you include more than one category, the results will include results that match <i>any</i> of the categories listed.</p> <p>For more information about using categories, including a list of Amazon Location categories, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/category-filtering.html\">Categories and filtering</a>, in the <i>Amazon Location Service Developer Guide</i>.</p>" }, - "Text":{ - "shape":"SearchPlaceIndexForSuggestionsRequestTextString", - "documentation":"<p>The free-form partial text to use to generate place suggestions. For example, <code>eiffel tow</code>.</p>" + "Key":{ + "shape":"ApiKey", + "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", + "location":"querystring", + "locationName":"key" } } }, @@ -4923,58 +5368,58 @@ "SearchPlaceIndexForSuggestionsResponse":{ "type":"structure", "required":[ - "Results", - "Summary" + "Summary", + "Results" ], "members":{ - "Results":{ - "shape":"SearchForSuggestionsResultList", - "documentation":"<p>A list of place suggestions that best match the search text.</p>" - }, "Summary":{ "shape":"SearchPlaceIndexForSuggestionsSummary", "documentation":"<p>Contains a summary of the request. Echoes the input values for <code>BiasPosition</code>, <code>FilterBBox</code>, <code>FilterCountries</code>, <code>Language</code>, <code>MaxResults</code>, and <code>Text</code>. Also includes the <code>DataSource</code> of the place index. </p>" + }, + "Results":{ + "shape":"SearchForSuggestionsResultList", + "documentation":"<p>A list of place suggestions that best match the search text.</p>" } } }, "SearchPlaceIndexForSuggestionsSummary":{ "type":"structure", "required":[ - "DataSource", - "Text" + "Text", + "DataSource" ], "members":{ + "Text":{ + "shape":"SensitiveString", + "documentation":"<p>The free-form partial text input specified in the request.</p>" + }, "BiasPosition":{ "shape":"Position", "documentation":"<p>Contains the coordinates for the optional bias position specified in the request.</p> <p>This parameter contains a pair of numbers. The first number represents the X coordinate, or longitude; the second number represents the Y coordinate, or latitude.</p> <p>For example, <code>[-123.1174, 49.2847]</code> represents the position with longitude <code>-123.1174</code> and latitude <code>49.2847</code>.</p>" }, - "DataSource":{ - "shape":"String", - "documentation":"<p>The geospatial data provider attached to the place index resource specified in the request. Values can be one of the following:</p> <ul> <li> <p>Esri</p> </li> <li> <p>Grab</p> </li> <li> <p>Here</p> </li> </ul> <p>For more information about data providers, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Amazon Location Service data providers</a>.</p>" - }, "FilterBBox":{ "shape":"BoundingBox", "documentation":"<p>Contains the coordinates for the optional bounding box specified in the request.</p>" }, - "FilterCategories":{ - "shape":"FilterPlaceCategoryList", - "documentation":"<p>The optional category filter specified in the request.</p>" - }, "FilterCountries":{ "shape":"CountryCodeList", "documentation":"<p>Contains the optional country filter specified in the request.</p>" }, - "Language":{ - "shape":"LanguageTag", - "documentation":"<p>The preferred language used to return results. Matches the language in the request. The value is a valid <a href=\"https://tools.ietf.org/search/bcp47\">BCP 47</a> language tag, for example, <code>en</code> for English.</p>" - }, "MaxResults":{ "shape":"Integer", "documentation":"<p>Contains the optional result count limit specified in the request.</p>" }, - "Text":{ - "shape":"SensitiveString", - "documentation":"<p>The free-form partial text input specified in the request.</p>" + "DataSource":{ + "shape":"String", + "documentation":"<p>The geospatial data provider attached to the place index resource specified in the request. Values can be one of the following:</p> <ul> <li> <p>Esri</p> </li> <li> <p>Grab</p> </li> <li> <p>Here</p> </li> </ul> <p>For more information about data providers, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Amazon Location Service data providers</a>.</p>" + }, + "Language":{ + "shape":"LanguageTag", + "documentation":"<p>The preferred language used to return results. Matches the language in the request. The value is a valid <a href=\"https://tools.ietf.org/search/bcp47\">BCP 47</a> language tag, for example, <code>en</code> for English.</p>" + }, + "FilterCategories":{ + "shape":"FilterPlaceCategoryList", + "documentation":"<p>The optional category filter specified in the request.</p>" } }, "documentation":"<p>A summary of the request sent by using <code>SearchPlaceIndexForSuggestions</code>.</p>" @@ -4986,6 +5431,16 @@ "Text" ], "members":{ + "IndexName":{ + "shape":"ResourceName", + "documentation":"<p>The name of the place index resource you want to use for the search.</p>", + "location":"uri", + "locationName":"IndexName" + }, + "Text":{ + "shape":"SearchPlaceIndexForTextRequestTextString", + "documentation":"<p>The address, name, city, or region to be used in the search in free-form text format. For example, <code>123 Any Street</code>.</p>" + }, "BiasPosition":{ "shape":"Position", "documentation":"<p>An optional parameter that indicates a preference for places that are closer to a specified position.</p> <p> If provided, this parameter must contain a pair of numbers. The first number represents the X coordinate, or longitude; the second number represents the Y coordinate, or latitude.</p> <p>For example, <code>[-123.1174, 49.2847]</code> represents the position with longitude <code>-123.1174</code> and latitude <code>49.2847</code>.</p> <note> <p> <code>BiasPosition</code> and <code>FilterBBox</code> are mutually exclusive. Specifying both options results in an error. </p> </note>" @@ -4994,37 +5449,27 @@ "shape":"BoundingBox", "documentation":"<p>An optional parameter that limits the search results by returning only places that are within the provided bounding box.</p> <p> If provided, this parameter must contain a total of four consecutive numbers in two pairs. The first pair of numbers represents the X and Y coordinates (longitude and latitude, respectively) of the southwest corner of the bounding box; the second pair of numbers represents the X and Y coordinates (longitude and latitude, respectively) of the northeast corner of the bounding box.</p> <p>For example, <code>[-12.7935, -37.4835, -12.0684, -36.9542]</code> represents a bounding box where the southwest corner has longitude <code>-12.7935</code> and latitude <code>-37.4835</code>, and the northeast corner has longitude <code>-12.0684</code> and latitude <code>-36.9542</code>.</p> <note> <p> <code>FilterBBox</code> and <code>BiasPosition</code> are mutually exclusive. Specifying both options results in an error. </p> </note>" }, - "FilterCategories":{ - "shape":"FilterPlaceCategoryList", - "documentation":"<p>A list of one or more Amazon Location categories to filter the returned places. If you include more than one category, the results will include results that match <i>any</i> of the categories listed.</p> <p>For more information about using categories, including a list of Amazon Location categories, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/category-filtering.html\">Categories and filtering</a>, in the <i>Amazon Location Service Developer Guide</i>.</p>" - }, "FilterCountries":{ "shape":"CountryCodeList", "documentation":"<p>An optional parameter that limits the search results by returning only places that are in a specified list of countries.</p> <ul> <li> <p>Valid values include <a href=\"https://www.iso.org/iso-3166-country-codes.html\">ISO 3166</a> 3-digit country codes. For example, Australia uses three upper-case characters: <code>AUS</code>.</p> </li> </ul>" }, - "IndexName":{ - "shape":"ResourceName", - "documentation":"<p>The name of the place index resource you want to use for the search.</p>", - "location":"uri", - "locationName":"IndexName" - }, - "Key":{ - "shape":"ApiKey", - "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", - "location":"querystring", - "locationName":"key" + "MaxResults":{ + "shape":"PlaceIndexSearchResultLimit", + "documentation":"<p>An optional parameter. The maximum number of results returned per request. </p> <p>The default: <code>50</code> </p>" }, "Language":{ "shape":"LanguageTag", "documentation":"<p>The preferred language used to return results. The value must be a valid <a href=\"https://tools.ietf.org/search/bcp47\">BCP 47</a> language tag, for example, <code>en</code> for English.</p> <p>This setting affects the languages used in the results, but not the results themselves. If no language is specified, or not supported for a particular result, the partner automatically chooses a language for the result.</p> <p>For an example, we'll use the Greek language. You search for <code>Athens, Greece</code>, with the <code>language</code> parameter set to <code>en</code>. The result found will most likely be returned as <code>Athens</code>.</p> <p>If you set the <code>language</code> parameter to <code>el</code>, for Greek, then the result found will more likely be returned as <code>Αθήνα</code>.</p> <p>If the data provider does not have a value for Greek, the result will be in a language that the provider does support.</p>" }, - "MaxResults":{ - "shape":"PlaceIndexSearchResultLimit", - "documentation":"<p>An optional parameter. The maximum number of results returned per request. </p> <p>The default: <code>50</code> </p>" + "FilterCategories":{ + "shape":"FilterPlaceCategoryList", + "documentation":"<p>A list of one or more Amazon Location categories to filter the returned places. If you include more than one category, the results will include results that match <i>any</i> of the categories listed.</p> <p>For more information about using categories, including a list of Amazon Location categories, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/category-filtering.html\">Categories and filtering</a>, in the <i>Amazon Location Service Developer Guide</i>.</p>" }, - "Text":{ - "shape":"SearchPlaceIndexForTextRequestTextString", - "documentation":"<p>The address, name, city, or region to be used in the search in free-form text format. For example, <code>123 Any Street</code>.</p>" + "Key":{ + "shape":"ApiKey", + "documentation":"<p>The optional <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/using-apikeys.html\">API key</a> to authorize the request.</p>", + "location":"querystring", + "locationName":"key" } } }, @@ -5037,51 +5482,43 @@ "SearchPlaceIndexForTextResponse":{ "type":"structure", "required":[ - "Results", - "Summary" + "Summary", + "Results" ], "members":{ - "Results":{ - "shape":"SearchForTextResultList", - "documentation":"<p>A list of Places matching the input text. Each result contains additional information about the specific point of interest. </p> <p>Not all response properties are included with all responses. Some properties may only be returned by specific data partners.</p>" - }, "Summary":{ "shape":"SearchPlaceIndexForTextSummary", "documentation":"<p>Contains a summary of the request. Echoes the input values for <code>BiasPosition</code>, <code>FilterBBox</code>, <code>FilterCountries</code>, <code>Language</code>, <code>MaxResults</code>, and <code>Text</code>. Also includes the <code>DataSource</code> of the place index and the bounding box, <code>ResultBBox</code>, which surrounds the search results. </p>" + }, + "Results":{ + "shape":"SearchForTextResultList", + "documentation":"<p>A list of Places matching the input text. Each result contains additional information about the specific point of interest. </p> <p>Not all response properties are included with all responses. Some properties may only be returned by specific data partners.</p>" } } }, "SearchPlaceIndexForTextSummary":{ "type":"structure", "required":[ - "DataSource", - "Text" + "Text", + "DataSource" ], "members":{ + "Text":{ + "shape":"SensitiveString", + "documentation":"<p>The search text specified in the request.</p>" + }, "BiasPosition":{ "shape":"Position", "documentation":"<p>Contains the coordinates for the optional bias position specified in the request.</p> <p>This parameter contains a pair of numbers. The first number represents the X coordinate, or longitude; the second number represents the Y coordinate, or latitude.</p> <p>For example, <code>[-123.1174, 49.2847]</code> represents the position with longitude <code>-123.1174</code> and latitude <code>49.2847</code>.</p>" }, - "DataSource":{ - "shape":"String", - "documentation":"<p>The geospatial data provider attached to the place index resource specified in the request. Values can be one of the following:</p> <ul> <li> <p>Esri</p> </li> <li> <p>Grab</p> </li> <li> <p>Here</p> </li> </ul> <p>For more information about data providers, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Amazon Location Service data providers</a>.</p>" - }, "FilterBBox":{ "shape":"BoundingBox", "documentation":"<p>Contains the coordinates for the optional bounding box specified in the request.</p>" }, - "FilterCategories":{ - "shape":"FilterPlaceCategoryList", - "documentation":"<p>The optional category filter specified in the request.</p>" - }, "FilterCountries":{ "shape":"CountryCodeList", "documentation":"<p>Contains the optional country filter specified in the request.</p>" }, - "Language":{ - "shape":"LanguageTag", - "documentation":"<p>The preferred language used to return results. Matches the language in the request. The value is a valid <a href=\"https://tools.ietf.org/search/bcp47\">BCP 47</a> language tag, for example, <code>en</code> for English.</p>" - }, "MaxResults":{ "shape":"PlaceIndexSearchResultLimit", "documentation":"<p>Contains the optional result count limit specified in the request.</p>" @@ -5090,9 +5527,17 @@ "shape":"BoundingBox", "documentation":"<p>The bounding box that fully contains all search results.</p> <note> <p>If you specified the optional <code>FilterBBox</code> parameter in the request, <code>ResultBBox</code> is contained within <code>FilterBBox</code>.</p> </note>" }, - "Text":{ - "shape":"SensitiveString", - "documentation":"<p>The search text specified in the request.</p>" + "DataSource":{ + "shape":"String", + "documentation":"<p>The geospatial data provider attached to the place index resource specified in the request. Values can be one of the following:</p> <ul> <li> <p>Esri</p> </li> <li> <p>Grab</p> </li> <li> <p>Here</p> </li> </ul> <p>For more information about data providers, see <a href=\"https://docs.aws.amazon.com/location/latest/developerguide/what-is-data-provider.html\">Amazon Location Service data providers</a>.</p>" + }, + "Language":{ + "shape":"LanguageTag", + "documentation":"<p>The preferred language used to return results. Matches the language in the request. The value is a valid <a href=\"https://tools.ietf.org/search/bcp47\">BCP 47</a> language tag, for example, <code>en</code> for English.</p>" + }, + "FilterCategories":{ + "shape":"FilterPlaceCategoryList", + "documentation":"<p>The optional category filter specified in the request.</p>" } }, "documentation":"<p>A summary of the request sent by using <code>SearchPlaceIndexForText</code>.</p>" @@ -5118,6 +5563,13 @@ }, "exception":true }, + "SpeedUnit":{ + "type":"string", + "enum":[ + "KilometersPerHour", + "MilesPerHour" + ] + }, "Status":{ "type":"string", "enum":[ @@ -5128,31 +5580,31 @@ "Step":{ "type":"structure", "required":[ - "Distance", - "DurationSeconds", + "StartPosition", "EndPosition", - "StartPosition" + "Distance", + "DurationSeconds" ], "members":{ - "Distance":{ - "shape":"StepDistanceDouble", - "documentation":"<p>The travel distance between the step's <code>StartPosition</code> and <code>EndPosition</code>.</p>" - }, - "DurationSeconds":{ - "shape":"StepDurationSecondsDouble", - "documentation":"<p>The estimated travel time, in seconds, from the step's <code>StartPosition</code> to the <code>EndPosition</code>. . The travel mode and departure time that you specify in the request determines the calculated time.</p>" + "StartPosition":{ + "shape":"Position", + "documentation":"<p>The starting position of a step. If the position is the first step in the leg, this position is the same as the start position of the leg.</p>" }, "EndPosition":{ "shape":"Position", "documentation":"<p>The end position of a step. If the position the last step in the leg, this position is the same as the end position of the leg.</p>" }, + "Distance":{ + "shape":"StepDistanceDouble", + "documentation":"<p>The travel distance between the step's <code>StartPosition</code> and <code>EndPosition</code>.</p>" + }, + "DurationSeconds":{ + "shape":"StepDurationSecondsDouble", + "documentation":"<p>The estimated travel time, in seconds, from the step's <code>StartPosition</code> to the <code>EndPosition</code>. . The travel mode and departure time that you specify in the request determines the calculated time.</p>" + }, "GeometryOffset":{ "shape":"StepGeometryOffsetInteger", "documentation":"<p>Represents the start position, or index, in a sequence of steps within the leg's line string geometry. For example, the index of the first step in a leg geometry is <code>0</code>. </p> <p>Included in the response for queries that set <code>IncludeLegGeometry</code> to <code>True</code>. </p>" - }, - "StartPosition":{ - "shape":"Position", - "documentation":"<p>The starting position of a step. If the position is the first step in the leg, this position is the same as the start position of the leg.</p>" } }, "documentation":"<p> Represents an element of a leg within a route. A step contains instructions for how to move to the next step in the leg. </p>" @@ -5181,7 +5633,7 @@ "type":"string", "max":128, "min":1, - "pattern":"^[a-zA-Z+-=._:/]+$" + "pattern":"[a-zA-Z+-=._:/]+" }, "TagKeys":{ "type":"list", @@ -5224,7 +5676,7 @@ "type":"string", "max":256, "min":0, - "pattern":"^[A-Za-z0-9 _=@:.+-/]*$" + "pattern":"[A-Za-z0-9 _=@:.+-/]*" }, "ThrottlingException":{ "type":"structure", @@ -5290,21 +5742,21 @@ "TruckDimensions":{ "type":"structure", "members":{ - "Height":{ - "shape":"TruckDimensionsHeightDouble", - "documentation":"<p>The height of the truck.</p> <ul> <li> <p>For example, <code>4.5</code>.</p> </li> </ul> <note> <p> For routes calculated with a HERE resource, this value must be between 0 and 50 meters. </p> </note>" - }, "Length":{ "shape":"TruckDimensionsLengthDouble", "documentation":"<p>The length of the truck.</p> <ul> <li> <p>For example, <code>15.5</code>.</p> </li> </ul> <note> <p> For routes calculated with a HERE resource, this value must be between 0 and 300 meters. </p> </note>" }, - "Unit":{ - "shape":"DimensionUnit", - "documentation":"<p> Specifies the unit of measurement for the truck dimensions.</p> <p>Default Value: <code>Meters</code> </p>" + "Height":{ + "shape":"TruckDimensionsHeightDouble", + "documentation":"<p>The height of the truck.</p> <ul> <li> <p>For example, <code>4.5</code>.</p> </li> </ul> <note> <p> For routes calculated with a HERE resource, this value must be between 0 and 50 meters. </p> </note>" }, "Width":{ "shape":"TruckDimensionsWidthDouble", "documentation":"<p>The width of the truck.</p> <ul> <li> <p>For example, <code>4.5</code>.</p> </li> </ul> <note> <p> For routes calculated with a HERE resource, this value must be between 0 and 50 meters. </p> </note>" + }, + "Unit":{ + "shape":"DimensionUnit", + "documentation":"<p> Specifies the unit of measurement for the truck dimensions.</p> <p>Default Value: <code>Meters</code> </p>" } }, "documentation":"<p>Contains details about the truck dimensions in the unit of measurement that you specify. Used to filter out roads that can't support or allow the specified dimensions for requests that specify <code>TravelMode</code> as <code>Truck</code>.</p>" @@ -5379,10 +5831,6 @@ "location":"uri", "locationName":"CollectionName" }, - "Description":{ - "shape":"ResourceDescription", - "documentation":"<p>Updates the description for the geofence collection.</p>" - }, "PricingPlan":{ "shape":"PricingPlan", "documentation":"<p>No longer used. If included, the only allowed value is <code>RequestBasedUsage</code>.</p>", @@ -5394,25 +5842,29 @@ "documentation":"<p>This parameter is no longer used.</p>", "deprecated":true, "deprecatedMessage":"Deprecated. No longer allowed." + }, + "Description":{ + "shape":"ResourceDescription", + "documentation":"<p>Updates the description for the geofence collection.</p>" } } }, "UpdateGeofenceCollectionResponse":{ "type":"structure", "required":[ - "CollectionArn", "CollectionName", + "CollectionArn", "UpdateTime" ], "members":{ - "CollectionArn":{ - "shape":"Arn", - "documentation":"<p>The Amazon Resource Name (ARN) of the updated geofence collection. Used to specify a resource across Amazon Web Services.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:geofence-collection/ExampleGeofenceCollection</code> </p> </li> </ul>" - }, "CollectionName":{ "shape":"ResourceName", "documentation":"<p>The name of the updated geofence collection.</p>" }, + "CollectionArn":{ + "shape":"Arn", + "documentation":"<p>The Amazon Resource Name (ARN) of the updated geofence collection. Used to specify a resource across Amazon Web Services.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:geofence-collection/ExampleGeofenceCollection</code> </p> </li> </ul>" + }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The time when the geofence collection was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\">ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code> </p>" @@ -5423,6 +5875,12 @@ "type":"structure", "required":["KeyName"], "members":{ + "KeyName":{ + "shape":"ResourceName", + "documentation":"<p>The name of the API key resource to update.</p>", + "location":"uri", + "locationName":"KeyName" + }, "Description":{ "shape":"ResourceDescription", "documentation":"<p>Updates the description for the API key resource.</p>" @@ -5431,20 +5889,14 @@ "shape":"Timestamp", "documentation":"<p>Updates the timestamp for when the API key resource will expire in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" }, - "ForceUpdate":{ - "shape":"Boolean", - "documentation":"<p>The boolean flag to be included for updating <code>ExpireTime</code> or <code>Restrictions</code> details.</p> <p>Must be set to <code>true</code> to update an API key resource that has been used in the past 7 days.</p> <p> <code>False</code> if force update is not preferred</p> <p>Default value: <code>False</code> </p>" - }, - "KeyName":{ - "shape":"ResourceName", - "documentation":"<p>The name of the API key resource to update.</p>", - "location":"uri", - "locationName":"KeyName" - }, "NoExpiry":{ "shape":"Boolean", "documentation":"<p>Whether the API key should expire. Set to <code>true</code> to set the API key to have no expiration time.</p>" }, + "ForceUpdate":{ + "shape":"Boolean", + "documentation":"<p>The boolean flag to be included for updating <code>ExpireTime</code> or <code>Restrictions</code> details.</p> <p>Must be set to <code>true</code> to update an API key resource that has been used in the past 7 days.</p> <p> <code>False</code> if force update is not preferred</p> <p>Default value: <code>False</code> </p>" + }, "Restrictions":{ "shape":"ApiKeyRestrictions", "documentation":"<p>Updates the API key restrictions for the API key resource.</p>" @@ -5477,14 +5929,6 @@ "type":"structure", "required":["MapName"], "members":{ - "ConfigurationUpdate":{ - "shape":"MapConfigurationUpdate", - "documentation":"<p>Updates the parts of the map configuration that can be updated, including the political view.</p>" - }, - "Description":{ - "shape":"ResourceDescription", - "documentation":"<p>Updates the description for the map resource.</p>" - }, "MapName":{ "shape":"ResourceName", "documentation":"<p>The name of the map resource to update.</p>", @@ -5496,25 +5940,33 @@ "documentation":"<p>No longer used. If included, the only allowed value is <code>RequestBasedUsage</code>.</p>", "deprecated":true, "deprecatedMessage":"Deprecated. If included, the only allowed value is RequestBasedUsage." + }, + "Description":{ + "shape":"ResourceDescription", + "documentation":"<p>Updates the description for the map resource.</p>" + }, + "ConfigurationUpdate":{ + "shape":"MapConfigurationUpdate", + "documentation":"<p>Updates the parts of the map configuration that can be updated, including the political view.</p>" } } }, "UpdateMapResponse":{ "type":"structure", "required":[ - "MapArn", "MapName", + "MapArn", "UpdateTime" ], "members":{ - "MapArn":{ - "shape":"GeoArn", - "documentation":"<p>The Amazon Resource Name (ARN) of the updated map resource. Used to specify a resource across AWS.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:map/ExampleMap</code> </p> </li> </ul>" - }, "MapName":{ "shape":"ResourceName", "documentation":"<p>The name of the updated map resource.</p>" }, + "MapArn":{ + "shape":"GeoArn", + "documentation":"<p>The Amazon Resource Name (ARN) of the updated map resource. Used to specify a resource across AWS.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:map/ExampleMap</code> </p> </li> </ul>" + }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the map resource was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" @@ -5525,14 +5977,6 @@ "type":"structure", "required":["IndexName"], "members":{ - "DataSourceConfiguration":{ - "shape":"DataSourceConfiguration", - "documentation":"<p>Updates the data storage option for the place index resource.</p>" - }, - "Description":{ - "shape":"ResourceDescription", - "documentation":"<p>Updates the description for the place index resource.</p>" - }, "IndexName":{ "shape":"ResourceName", "documentation":"<p>The name of the place index resource to update.</p>", @@ -5544,25 +5988,33 @@ "documentation":"<p>No longer used. If included, the only allowed value is <code>RequestBasedUsage</code>.</p>", "deprecated":true, "deprecatedMessage":"Deprecated. If included, the only allowed value is RequestBasedUsage." + }, + "Description":{ + "shape":"ResourceDescription", + "documentation":"<p>Updates the description for the place index resource.</p>" + }, + "DataSourceConfiguration":{ + "shape":"DataSourceConfiguration", + "documentation":"<p>Updates the data storage option for the place index resource.</p>" } } }, "UpdatePlaceIndexResponse":{ "type":"structure", "required":[ - "IndexArn", "IndexName", + "IndexArn", "UpdateTime" ], "members":{ - "IndexArn":{ - "shape":"GeoArn", - "documentation":"<p>The Amazon Resource Name (ARN) of the upated place index resource. Used to specify a resource across Amazon Web Services.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:place- index/ExamplePlaceIndex</code> </p> </li> </ul>" - }, "IndexName":{ "shape":"ResourceName", "documentation":"<p>The name of the updated place index resource.</p>" }, + "IndexArn":{ + "shape":"GeoArn", + "documentation":"<p>The Amazon Resource Name (ARN) of the upated place index resource. Used to specify a resource across Amazon Web Services.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:place- index/ExamplePlaceIndex</code> </p> </li> </ul>" + }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the place index resource was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" @@ -5579,34 +6031,34 @@ "location":"uri", "locationName":"CalculatorName" }, - "Description":{ - "shape":"ResourceDescription", - "documentation":"<p>Updates the description for the route calculator resource.</p>" - }, "PricingPlan":{ "shape":"PricingPlan", "documentation":"<p>No longer used. If included, the only allowed value is <code>RequestBasedUsage</code>.</p>", "deprecated":true, "deprecatedMessage":"Deprecated. If included, the only allowed value is RequestBasedUsage." + }, + "Description":{ + "shape":"ResourceDescription", + "documentation":"<p>Updates the description for the route calculator resource.</p>" } } }, "UpdateRouteCalculatorResponse":{ "type":"structure", "required":[ - "CalculatorArn", "CalculatorName", + "CalculatorArn", "UpdateTime" ], "members":{ - "CalculatorArn":{ - "shape":"GeoArn", - "documentation":"<p>The Amazon Resource Name (ARN) of the updated route calculator resource. Used to specify a resource across AWS.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:route- calculator/ExampleCalculator</code> </p> </li> </ul>" - }, "CalculatorName":{ "shape":"ResourceName", "documentation":"<p>The name of the updated route calculator resource.</p>" }, + "CalculatorArn":{ + "shape":"GeoArn", + "documentation":"<p>The Amazon Resource Name (ARN) of the updated route calculator resource. Used to specify a resource across AWS.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:route- calculator/ExampleCalculator</code> </p> </li> </ul>" + }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the route calculator was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" @@ -5617,21 +6069,11 @@ "type":"structure", "required":["TrackerName"], "members":{ - "Description":{ - "shape":"ResourceDescription", - "documentation":"<p>Updates the description for the tracker resource.</p>" - }, - "EventBridgeEnabled":{ - "shape":"Boolean", - "documentation":"<p>Whether to enable position <code>UPDATE</code> events from this tracker to be sent to EventBridge.</p> <note> <p>You do not need enable this feature to get <code>ENTER</code> and <code>EXIT</code> events for geofences with this tracker. Those events are always sent to EventBridge.</p> </note>" - }, - "KmsKeyEnableGeospatialQueries":{ - "shape":"Boolean", - "documentation":"<p>Enables <code>GeospatialQueries</code> for a tracker that uses a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html\">Amazon Web Services KMS customer managed key</a>.</p> <p>This parameter is only used if you are using a KMS customer managed key.</p>" - }, - "PositionFiltering":{ - "shape":"PositionFiltering", - "documentation":"<p>Updates the position filtering for the tracker resource.</p> <p>Valid values:</p> <ul> <li> <p> <code>TimeBased</code> - Location updates are evaluated against linked geofence collections, but not every location update is stored. If your update frequency is more often than 30 seconds, only one update per 30 seconds is stored for each unique device ID. </p> </li> <li> <p> <code>DistanceBased</code> - If the device has moved less than 30 m (98.4 ft), location updates are ignored. Location updates within this distance are neither evaluated against linked geofence collections, nor stored. This helps control costs by reducing the number of geofence evaluations and historical device positions to paginate through. Distance-based filtering can also reduce the effects of GPS noise when displaying device trajectories on a map. </p> </li> <li> <p> <code>AccuracyBased</code> - If the device has moved less than the measured accuracy, location updates are ignored. For example, if two consecutive updates from a device have a horizontal accuracy of 5 m and 10 m, the second update is ignored if the device has moved less than 15 m. Ignored location updates are neither evaluated against linked geofence collections, nor stored. This helps educe the effects of GPS noise when displaying device trajectories on a map, and can help control costs by reducing the number of geofence evaluations. </p> </li> </ul>" + "TrackerName":{ + "shape":"ResourceName", + "documentation":"<p>The name of the tracker resource to update.</p>", + "location":"uri", + "locationName":"TrackerName" }, "PricingPlan":{ "shape":"PricingPlan", @@ -5645,49 +6087,58 @@ "deprecated":true, "deprecatedMessage":"Deprecated. No longer allowed." }, - "TrackerName":{ - "shape":"ResourceName", - "documentation":"<p>The name of the tracker resource to update.</p>", - "location":"uri", - "locationName":"TrackerName" + "Description":{ + "shape":"ResourceDescription", + "documentation":"<p>Updates the description for the tracker resource.</p>" + }, + "PositionFiltering":{ + "shape":"PositionFiltering", + "documentation":"<p>Updates the position filtering for the tracker resource.</p> <p>Valid values:</p> <ul> <li> <p> <code>TimeBased</code> - Location updates are evaluated against linked geofence collections, but not every location update is stored. If your update frequency is more often than 30 seconds, only one update per 30 seconds is stored for each unique device ID. </p> </li> <li> <p> <code>DistanceBased</code> - If the device has moved less than 30 m (98.4 ft), location updates are ignored. Location updates within this distance are neither evaluated against linked geofence collections, nor stored. This helps control costs by reducing the number of geofence evaluations and historical device positions to paginate through. Distance-based filtering can also reduce the effects of GPS noise when displaying device trajectories on a map. </p> </li> <li> <p> <code>AccuracyBased</code> - If the device has moved less than the measured accuracy, location updates are ignored. For example, if two consecutive updates from a device have a horizontal accuracy of 5 m and 10 m, the second update is ignored if the device has moved less than 15 m. Ignored location updates are neither evaluated against linked geofence collections, nor stored. This helps educe the effects of GPS noise when displaying device trajectories on a map, and can help control costs by reducing the number of geofence evaluations. </p> </li> </ul>" + }, + "EventBridgeEnabled":{ + "shape":"Boolean", + "documentation":"<p>Whether to enable position <code>UPDATE</code> events from this tracker to be sent to EventBridge.</p> <note> <p>You do not need enable this feature to get <code>ENTER</code> and <code>EXIT</code> events for geofences with this tracker. Those events are always sent to EventBridge.</p> </note>" + }, + "KmsKeyEnableGeospatialQueries":{ + "shape":"Boolean", + "documentation":"<p>Enables <code>GeospatialQueries</code> for a tracker that uses a <a href=\"https://docs.aws.amazon.com/kms/latest/developerguide/create-keys.html\">Amazon Web Services KMS customer managed key</a>.</p> <p>This parameter is only used if you are using a KMS customer managed key.</p>" } } }, "UpdateTrackerResponse":{ "type":"structure", "required":[ - "TrackerArn", "TrackerName", + "TrackerArn", "UpdateTime" ], "members":{ - "TrackerArn":{ - "shape":"Arn", - "documentation":"<p>The Amazon Resource Name (ARN) of the updated tracker resource. Used to specify a resource across AWS.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:tracker/ExampleTracker</code> </p> </li> </ul>" - }, "TrackerName":{ "shape":"ResourceName", "documentation":"<p>The name of the updated tracker resource.</p>" }, + "TrackerArn":{ + "shape":"Arn", + "documentation":"<p>The Amazon Resource Name (ARN) of the updated tracker resource. Used to specify a resource across AWS.</p> <ul> <li> <p>Format example: <code>arn:aws:geo:region:account-id:tracker/ExampleTracker</code> </p> </li> </ul>" + }, "UpdateTime":{ "shape":"Timestamp", "documentation":"<p>The timestamp for when the tracker resource was last updated in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601</a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" } } }, + "Uuid":{ + "type":"string", + "pattern":"[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}" + }, "ValidationException":{ "type":"structure", "required":[ - "FieldList", "Message", - "Reason" + "Reason", + "FieldList" ], "members":{ - "FieldList":{ - "shape":"ValidationExceptionFieldList", - "documentation":"<p>The field where the invalid entry was detected.</p>", - "locationName":"fieldList" - }, "Message":{ "shape":"String", "locationName":"message" @@ -5696,6 +6147,11 @@ "shape":"ValidationExceptionReason", "documentation":"<p>A message with the reason for the validation exception error.</p>", "locationName":"reason" + }, + "FieldList":{ + "shape":"ValidationExceptionFieldList", + "documentation":"<p>The field where the invalid entry was detected.</p>", + "locationName":"fieldList" } }, "documentation":"<p>The input failed to meet the constraints specified by the AWS service. </p>", @@ -5708,19 +6164,19 @@ "ValidationExceptionField":{ "type":"structure", "required":[ - "Message", - "Name" + "Name", + "Message" ], "members":{ - "Message":{ - "shape":"String", - "documentation":"<p>A message with the reason for the validation exception error.</p>", - "locationName":"message" - }, "Name":{ "shape":"String", "documentation":"<p>The field name where the invalid entry was detected.</p>", "locationName":"name" + }, + "Message":{ + "shape":"String", + "documentation":"<p>A message with the reason for the validation exception error.</p>", + "locationName":"message" } }, "documentation":"<p>The input failed to meet the constraints specified by the AWS service in a specified field. </p>" @@ -5745,6 +6201,95 @@ "Kilograms", "Pounds" ] + }, + "VerifyDevicePositionRequest":{ + "type":"structure", + "required":[ + "TrackerName", + "DeviceState" + ], + "members":{ + "TrackerName":{ + "shape":"ResourceName", + "documentation":"<p>The name of the tracker resource to be associated with verification request.</p>", + "location":"uri", + "locationName":"TrackerName" + }, + "DeviceState":{ + "shape":"DeviceState", + "documentation":"<p>The device's state, including position, IP address, cell signals and Wi-Fi access points.</p>" + }, + "DistanceUnit":{ + "shape":"DistanceUnit", + "documentation":"<p>The distance unit for the verification request.</p> <p>Default Value: <code>Kilometers</code> </p>" + } + } + }, + "VerifyDevicePositionResponse":{ + "type":"structure", + "required":[ + "InferredState", + "DeviceId", + "SampleTime", + "ReceivedTime", + "DistanceUnit" + ], + "members":{ + "InferredState":{ + "shape":"InferredState", + "documentation":"<p>The inferred state of the device, given the provided position, IP address, cellular signals, and Wi-Fi- access points.</p>" + }, + "DeviceId":{ + "shape":"Id", + "documentation":"<p>The device identifier.</p>" + }, + "SampleTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp at which the device's position was determined. Uses <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601 </a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + }, + "ReceivedTime":{ + "shape":"Timestamp", + "documentation":"<p>The timestamp for when the tracker resource received the device position in <a href=\"https://www.iso.org/iso-8601-date-and-time-format.html\"> ISO 8601 </a> format: <code>YYYY-MM-DDThh:mm:ss.sssZ</code>. </p>" + }, + "DistanceUnit":{ + "shape":"DistanceUnit", + "documentation":"<p>The distance unit for the verification response.</p>" + } + } + }, + "WiFiAccessPoint":{ + "type":"structure", + "required":[ + "MacAddress", + "Rss" + ], + "members":{ + "MacAddress":{ + "shape":"WiFiAccessPointMacAddressString", + "documentation":"<p>Medium access control address (Mac).</p>" + }, + "Rss":{ + "shape":"WiFiAccessPointRssInteger", + "documentation":"<p>Received signal strength (dBm) of the WLAN measurement data.</p>" + } + }, + "documentation":"<p>Wi-Fi access point.</p>" + }, + "WiFiAccessPointList":{ + "type":"list", + "member":{"shape":"WiFiAccessPoint"} + }, + "WiFiAccessPointMacAddressString":{ + "type":"string", + "max":17, + "min":12, + "pattern":"([0-9A-Fa-f]{2}[:-]?){5}([0-9A-Fa-f]{2})" + }, + "WiFiAccessPointRssInteger":{ + "type":"integer", + "box":true, + "max":0, + "min":-128 } }, "documentation":"<p>\"Suite of geospatial services including Maps, Places, Routes, Tracking, and Geofencing\"</p>" diff --git a/services/lookoutequipment/pom.xml b/services/lookoutequipment/pom.xml index c87c1c381309..2f7925b53e8e 100644 --- a/services/lookoutequipment/pom.xml +++ b/services/lookoutequipment/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>lookoutequipment</artifactId> <name>AWS Java SDK :: Services :: Lookout Equipment</name> diff --git a/services/lookoutmetrics/pom.xml b/services/lookoutmetrics/pom.xml index dce970e21174..4758c8d374e3 100644 --- a/services/lookoutmetrics/pom.xml +++ b/services/lookoutmetrics/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>lookoutmetrics</artifactId> <name>AWS Java SDK :: Services :: Lookout Metrics</name> diff --git a/services/lookoutvision/pom.xml b/services/lookoutvision/pom.xml index ef2630a8250d..fca59e9ef9be 100644 --- a/services/lookoutvision/pom.xml +++ b/services/lookoutvision/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>lookoutvision</artifactId> <name>AWS Java SDK :: Services :: Lookout Vision</name> diff --git a/services/m2/pom.xml b/services/m2/pom.xml index c79948502c56..6940c7fa3965 100644 --- a/services/m2/pom.xml +++ b/services/m2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>m2</artifactId> <name>AWS Java SDK :: Services :: M2</name> diff --git a/services/machinelearning/pom.xml b/services/machinelearning/pom.xml index 08a21e8ef157..387da3ff488e 100644 --- a/services/machinelearning/pom.xml +++ b/services/machinelearning/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>machinelearning</artifactId> <name>AWS Java SDK :: Services :: Amazon Machine Learning</name> diff --git a/services/macie2/pom.xml b/services/macie2/pom.xml index 3269a3921a87..577e1aab37bb 100644 --- a/services/macie2/pom.xml +++ b/services/macie2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>macie2</artifactId> <name>AWS Java SDK :: Services :: Macie2</name> diff --git a/services/mailmanager/pom.xml b/services/mailmanager/pom.xml index ca6057b8924c..389a098e841d 100644 --- a/services/mailmanager/pom.xml +++ b/services/mailmanager/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>mailmanager</artifactId> <name>AWS Java SDK :: Services :: Mail Manager</name> diff --git a/services/managedblockchain/pom.xml b/services/managedblockchain/pom.xml index 4e385b05dde4..637a94c5784f 100644 --- a/services/managedblockchain/pom.xml +++ b/services/managedblockchain/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>managedblockchain</artifactId> <name>AWS Java SDK :: Services :: ManagedBlockchain</name> diff --git a/services/managedblockchainquery/pom.xml b/services/managedblockchainquery/pom.xml index 77dbcbf4eb22..f2b1192fa49a 100644 --- a/services/managedblockchainquery/pom.xml +++ b/services/managedblockchainquery/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>managedblockchainquery</artifactId> <name>AWS Java SDK :: Services :: Managed Blockchain Query</name> diff --git a/services/marketplaceagreement/pom.xml b/services/marketplaceagreement/pom.xml index d1b61dfaa185..90bd494a5850 100644 --- a/services/marketplaceagreement/pom.xml +++ b/services/marketplaceagreement/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>marketplaceagreement</artifactId> <name>AWS Java SDK :: Services :: Marketplace Agreement</name> diff --git a/services/marketplacecatalog/pom.xml b/services/marketplacecatalog/pom.xml index beaf30dc0402..8ca3f0b4a8ee 100644 --- a/services/marketplacecatalog/pom.xml +++ b/services/marketplacecatalog/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>marketplacecatalog</artifactId> <name>AWS Java SDK :: Services :: Marketplace Catalog</name> diff --git a/services/marketplacecommerceanalytics/pom.xml b/services/marketplacecommerceanalytics/pom.xml index 728ced7afc52..59c654c9495d 100644 --- a/services/marketplacecommerceanalytics/pom.xml +++ b/services/marketplacecommerceanalytics/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>marketplacecommerceanalytics</artifactId> <name>AWS Java SDK :: Services :: AWS Marketplace Commerce Analytics</name> diff --git a/services/marketplacedeployment/pom.xml b/services/marketplacedeployment/pom.xml index c8d49c44c8eb..351adcc47a11 100644 --- a/services/marketplacedeployment/pom.xml +++ b/services/marketplacedeployment/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>marketplacedeployment</artifactId> <name>AWS Java SDK :: Services :: Marketplace Deployment</name> diff --git a/services/marketplaceentitlement/pom.xml b/services/marketplaceentitlement/pom.xml index 8fbdebdac31d..fe47f5371e90 100644 --- a/services/marketplaceentitlement/pom.xml +++ b/services/marketplaceentitlement/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>marketplaceentitlement</artifactId> <name>AWS Java SDK :: Services :: AWS Marketplace Entitlement</name> diff --git a/services/marketplacemetering/pom.xml b/services/marketplacemetering/pom.xml index 496ec5bf6859..70b0cb6f9800 100644 --- a/services/marketplacemetering/pom.xml +++ b/services/marketplacemetering/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>marketplacemetering</artifactId> <name>AWS Java SDK :: Services :: AWS Marketplace Metering Service</name> diff --git a/services/mediaconnect/pom.xml b/services/mediaconnect/pom.xml index 1e9853c2b1b8..3bb2727d952d 100644 --- a/services/mediaconnect/pom.xml +++ b/services/mediaconnect/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>mediaconnect</artifactId> <name>AWS Java SDK :: Services :: MediaConnect</name> diff --git a/services/mediaconvert/pom.xml b/services/mediaconvert/pom.xml index f0231908de78..918fc12b3d10 100644 --- a/services/mediaconvert/pom.xml +++ b/services/mediaconvert/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>mediaconvert</artifactId> diff --git a/services/medialive/pom.xml b/services/medialive/pom.xml index 1155e2e96a2a..feb0170a0b75 100644 --- a/services/medialive/pom.xml +++ b/services/medialive/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>medialive</artifactId> diff --git a/services/mediapackage/pom.xml b/services/mediapackage/pom.xml index fc59d672978f..e4b97c3e8cf3 100644 --- a/services/mediapackage/pom.xml +++ b/services/mediapackage/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>mediapackage</artifactId> diff --git a/services/mediapackagev2/pom.xml b/services/mediapackagev2/pom.xml index c7c72940a835..831aefec7e3c 100644 --- a/services/mediapackagev2/pom.xml +++ b/services/mediapackagev2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>mediapackagev2</artifactId> <name>AWS Java SDK :: Services :: Media Package V2</name> diff --git a/services/mediapackagevod/pom.xml b/services/mediapackagevod/pom.xml index 1343ba473324..006636ea6734 100644 --- a/services/mediapackagevod/pom.xml +++ b/services/mediapackagevod/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>mediapackagevod</artifactId> <name>AWS Java SDK :: Services :: MediaPackage Vod</name> diff --git a/services/mediastore/pom.xml b/services/mediastore/pom.xml index 95798267a864..126436d22ca9 100644 --- a/services/mediastore/pom.xml +++ b/services/mediastore/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>mediastore</artifactId> diff --git a/services/mediastoredata/pom.xml b/services/mediastoredata/pom.xml index 7cb8ba0a1e6f..269ff462cc76 100644 --- a/services/mediastoredata/pom.xml +++ b/services/mediastoredata/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>mediastoredata</artifactId> diff --git a/services/mediatailor/pom.xml b/services/mediatailor/pom.xml index 1aca7ae735cb..d35e3d7c1fc8 100644 --- a/services/mediatailor/pom.xml +++ b/services/mediatailor/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>mediatailor</artifactId> <name>AWS Java SDK :: Services :: MediaTailor</name> diff --git a/services/medicalimaging/pom.xml b/services/medicalimaging/pom.xml index 4ef0de0c87b4..b532088410e4 100644 --- a/services/medicalimaging/pom.xml +++ b/services/medicalimaging/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>medicalimaging</artifactId> <name>AWS Java SDK :: Services :: Medical Imaging</name> diff --git a/services/memorydb/pom.xml b/services/memorydb/pom.xml index c09523599f1b..ea0c426a19c9 100644 --- a/services/memorydb/pom.xml +++ b/services/memorydb/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>memorydb</artifactId> <name>AWS Java SDK :: Services :: Memory DB</name> diff --git a/services/mgn/pom.xml b/services/mgn/pom.xml index 57b0b2b82b55..7abe71d3accd 100644 --- a/services/mgn/pom.xml +++ b/services/mgn/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>mgn</artifactId> <name>AWS Java SDK :: Services :: Mgn</name> diff --git a/services/migrationhub/pom.xml b/services/migrationhub/pom.xml index 80e4fcce2a30..d977a0bab021 100644 --- a/services/migrationhub/pom.xml +++ b/services/migrationhub/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>migrationhub</artifactId> diff --git a/services/migrationhubconfig/pom.xml b/services/migrationhubconfig/pom.xml index 6417d302934b..e2677b89a65b 100644 --- a/services/migrationhubconfig/pom.xml +++ b/services/migrationhubconfig/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>migrationhubconfig</artifactId> <name>AWS Java SDK :: Services :: MigrationHub Config</name> diff --git a/services/migrationhuborchestrator/pom.xml b/services/migrationhuborchestrator/pom.xml index 466e5d23a093..ee94ddf644d5 100644 --- a/services/migrationhuborchestrator/pom.xml +++ b/services/migrationhuborchestrator/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>migrationhuborchestrator</artifactId> <name>AWS Java SDK :: Services :: Migration Hub Orchestrator</name> diff --git a/services/migrationhubrefactorspaces/pom.xml b/services/migrationhubrefactorspaces/pom.xml index e90f519b1ab9..274d64f688ac 100644 --- a/services/migrationhubrefactorspaces/pom.xml +++ b/services/migrationhubrefactorspaces/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>migrationhubrefactorspaces</artifactId> <name>AWS Java SDK :: Services :: Migration Hub Refactor Spaces</name> diff --git a/services/migrationhubstrategy/pom.xml b/services/migrationhubstrategy/pom.xml index 966712f720a7..42b5306ca576 100644 --- a/services/migrationhubstrategy/pom.xml +++ b/services/migrationhubstrategy/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>migrationhubstrategy</artifactId> <name>AWS Java SDK :: Services :: Migration Hub Strategy</name> diff --git a/services/mobile/pom.xml b/services/mobile/pom.xml index ac19b8553530..cd8b2ceaf2fe 100644 --- a/services/mobile/pom.xml +++ b/services/mobile/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>mobile</artifactId> diff --git a/services/mq/pom.xml b/services/mq/pom.xml index 79e6be68b10a..dca54dc1352c 100644 --- a/services/mq/pom.xml +++ b/services/mq/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>mq</artifactId> diff --git a/services/mturk/pom.xml b/services/mturk/pom.xml index 675ac9440ba1..1226ad7363a8 100644 --- a/services/mturk/pom.xml +++ b/services/mturk/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>mturk</artifactId> <name>AWS Java SDK :: Services :: Amazon Mechanical Turk Requester</name> diff --git a/services/mwaa/pom.xml b/services/mwaa/pom.xml index ae6c0ebf6ec8..ad4e8c19ab16 100644 --- a/services/mwaa/pom.xml +++ b/services/mwaa/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>mwaa</artifactId> <name>AWS Java SDK :: Services :: MWAA</name> diff --git a/services/neptune/pom.xml b/services/neptune/pom.xml index 23dcde40138c..23e0ca85ef2a 100644 --- a/services/neptune/pom.xml +++ b/services/neptune/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>neptune</artifactId> <name>AWS Java SDK :: Services :: Neptune</name> diff --git a/services/neptunedata/pom.xml b/services/neptunedata/pom.xml index a1a1757f3195..c4f53848903b 100644 --- a/services/neptunedata/pom.xml +++ b/services/neptunedata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>neptunedata</artifactId> <name>AWS Java SDK :: Services :: Neptunedata</name> diff --git a/services/neptunegraph/pom.xml b/services/neptunegraph/pom.xml index 73a5b75b16f2..c443b0309ec4 100644 --- a/services/neptunegraph/pom.xml +++ b/services/neptunegraph/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>neptunegraph</artifactId> <name>AWS Java SDK :: Services :: Neptune Graph</name> diff --git a/services/networkfirewall/pom.xml b/services/networkfirewall/pom.xml index 368066bc1c5e..49a0fe2c49dd 100644 --- a/services/networkfirewall/pom.xml +++ b/services/networkfirewall/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>networkfirewall</artifactId> <name>AWS Java SDK :: Services :: Network Firewall</name> diff --git a/services/networkmanager/pom.xml b/services/networkmanager/pom.xml index 1d0231ee74cc..3dcb5f290e02 100644 --- a/services/networkmanager/pom.xml +++ b/services/networkmanager/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>networkmanager</artifactId> <name>AWS Java SDK :: Services :: NetworkManager</name> diff --git a/services/networkmonitor/pom.xml b/services/networkmonitor/pom.xml index f0ac5640a974..40851bc4b962 100644 --- a/services/networkmonitor/pom.xml +++ b/services/networkmonitor/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>networkmonitor</artifactId> <name>AWS Java SDK :: Services :: Network Monitor</name> diff --git a/services/nimble/pom.xml b/services/nimble/pom.xml index 0bbf75e71ce0..9a738c830ef7 100644 --- a/services/nimble/pom.xml +++ b/services/nimble/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>nimble</artifactId> <name>AWS Java SDK :: Services :: Nimble</name> diff --git a/services/oam/pom.xml b/services/oam/pom.xml index 0bc7421291f7..3c515748cec3 100644 --- a/services/oam/pom.xml +++ b/services/oam/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>oam</artifactId> <name>AWS Java SDK :: Services :: OAM</name> diff --git a/services/omics/pom.xml b/services/omics/pom.xml index 8b7da9d51406..4098e3ba634d 100644 --- a/services/omics/pom.xml +++ b/services/omics/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>omics</artifactId> <name>AWS Java SDK :: Services :: Omics</name> diff --git a/services/opensearch/pom.xml b/services/opensearch/pom.xml index 648532972077..a92a867ead07 100644 --- a/services/opensearch/pom.xml +++ b/services/opensearch/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>opensearch</artifactId> <name>AWS Java SDK :: Services :: Open Search</name> diff --git a/services/opensearchserverless/pom.xml b/services/opensearchserverless/pom.xml index 71b34820e872..98fcad39dfa3 100644 --- a/services/opensearchserverless/pom.xml +++ b/services/opensearchserverless/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>opensearchserverless</artifactId> <name>AWS Java SDK :: Services :: Open Search Serverless</name> diff --git a/services/opsworks/pom.xml b/services/opsworks/pom.xml index f20134294cc0..3b5bac89c0bc 100644 --- a/services/opsworks/pom.xml +++ b/services/opsworks/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>opsworks</artifactId> <name>AWS Java SDK :: Services :: AWS OpsWorks</name> diff --git a/services/opsworkscm/pom.xml b/services/opsworkscm/pom.xml index 81feb44ca970..dc5cbf50e3cc 100644 --- a/services/opsworkscm/pom.xml +++ b/services/opsworkscm/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>opsworkscm</artifactId> <name>AWS Java SDK :: Services :: AWS OpsWorks for Chef Automate</name> diff --git a/services/organizations/pom.xml b/services/organizations/pom.xml index 6ffbd3d51343..20996b4c056e 100644 --- a/services/organizations/pom.xml +++ b/services/organizations/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>organizations</artifactId> <name>AWS Java SDK :: Services :: AWS Organizations</name> diff --git a/services/osis/pom.xml b/services/osis/pom.xml index c429bd9a80e7..2c7561a74eca 100644 --- a/services/osis/pom.xml +++ b/services/osis/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>osis</artifactId> <name>AWS Java SDK :: Services :: OSIS</name> diff --git a/services/outposts/pom.xml b/services/outposts/pom.xml index 2566c9d4884e..7ae17f333874 100644 --- a/services/outposts/pom.xml +++ b/services/outposts/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>outposts</artifactId> <name>AWS Java SDK :: Services :: Outposts</name> diff --git a/services/panorama/pom.xml b/services/panorama/pom.xml index bcec8688eeb1..06438b7a96c5 100644 --- a/services/panorama/pom.xml +++ b/services/panorama/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>panorama</artifactId> <name>AWS Java SDK :: Services :: Panorama</name> diff --git a/services/paymentcryptography/pom.xml b/services/paymentcryptography/pom.xml index c1bd6e7ad0b2..8369adfbde4d 100644 --- a/services/paymentcryptography/pom.xml +++ b/services/paymentcryptography/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>paymentcryptography</artifactId> <name>AWS Java SDK :: Services :: Payment Cryptography</name> diff --git a/services/paymentcryptographydata/pom.xml b/services/paymentcryptographydata/pom.xml index e03c1d40c53d..b0c81ec7193e 100644 --- a/services/paymentcryptographydata/pom.xml +++ b/services/paymentcryptographydata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>paymentcryptographydata</artifactId> <name>AWS Java SDK :: Services :: Payment Cryptography Data</name> diff --git a/services/pcaconnectorad/pom.xml b/services/pcaconnectorad/pom.xml index 6c104b6efae1..53462785ac32 100644 --- a/services/pcaconnectorad/pom.xml +++ b/services/pcaconnectorad/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>pcaconnectorad</artifactId> <name>AWS Java SDK :: Services :: Pca Connector Ad</name> diff --git a/services/personalize/pom.xml b/services/personalize/pom.xml index d451c47e9ad6..b2ab1a957681 100644 --- a/services/personalize/pom.xml +++ b/services/personalize/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>personalize</artifactId> <name>AWS Java SDK :: Services :: Personalize</name> diff --git a/services/personalizeevents/pom.xml b/services/personalizeevents/pom.xml index e64e66c7354f..ff1558f8d711 100644 --- a/services/personalizeevents/pom.xml +++ b/services/personalizeevents/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>personalizeevents</artifactId> <name>AWS Java SDK :: Services :: Personalize Events</name> diff --git a/services/personalizeruntime/pom.xml b/services/personalizeruntime/pom.xml index 0e5d7121005c..017c4ddcf8d4 100644 --- a/services/personalizeruntime/pom.xml +++ b/services/personalizeruntime/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>personalizeruntime</artifactId> <name>AWS Java SDK :: Services :: Personalize Runtime</name> diff --git a/services/pi/pom.xml b/services/pi/pom.xml index 8d967ad20063..057769cb3ce2 100644 --- a/services/pi/pom.xml +++ b/services/pi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>pi</artifactId> <name>AWS Java SDK :: Services :: PI</name> diff --git a/services/pinpoint/pom.xml b/services/pinpoint/pom.xml index 815984748911..462a0b1ad9e0 100644 --- a/services/pinpoint/pom.xml +++ b/services/pinpoint/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>pinpoint</artifactId> <name>AWS Java SDK :: Services :: Amazon Pinpoint</name> diff --git a/services/pinpointemail/pom.xml b/services/pinpointemail/pom.xml index 670c6b253fac..1590616f5b99 100644 --- a/services/pinpointemail/pom.xml +++ b/services/pinpointemail/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>pinpointemail</artifactId> <name>AWS Java SDK :: Services :: Pinpoint Email</name> diff --git a/services/pinpointsmsvoice/pom.xml b/services/pinpointsmsvoice/pom.xml index 5005131245fb..83864b966da9 100644 --- a/services/pinpointsmsvoice/pom.xml +++ b/services/pinpointsmsvoice/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>pinpointsmsvoice</artifactId> <name>AWS Java SDK :: Services :: Pinpoint SMS Voice</name> diff --git a/services/pinpointsmsvoicev2/pom.xml b/services/pinpointsmsvoicev2/pom.xml index f37cbd19e980..039f2d1c8dbd 100644 --- a/services/pinpointsmsvoicev2/pom.xml +++ b/services/pinpointsmsvoicev2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>pinpointsmsvoicev2</artifactId> <name>AWS Java SDK :: Services :: Pinpoint SMS Voice V2</name> diff --git a/services/pipes/pom.xml b/services/pipes/pom.xml index cd877a5a2155..6a3a0917288d 100644 --- a/services/pipes/pom.xml +++ b/services/pipes/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>pipes</artifactId> <name>AWS Java SDK :: Services :: Pipes</name> diff --git a/services/polly/pom.xml b/services/polly/pom.xml index 49998854cfea..90ec1a537863 100644 --- a/services/polly/pom.xml +++ b/services/polly/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>polly</artifactId> <name>AWS Java SDK :: Services :: Amazon Polly</name> diff --git a/services/pom.xml b/services/pom.xml index fb44c446e499..5f7a926cc540 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>services</artifactId> <name>AWS Java SDK :: Services</name> diff --git a/services/pricing/pom.xml b/services/pricing/pom.xml index a7d6d9c837a0..7259d23eb65c 100644 --- a/services/pricing/pom.xml +++ b/services/pricing/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>pricing</artifactId> diff --git a/services/privatenetworks/pom.xml b/services/privatenetworks/pom.xml index b4bd90bcc142..dc8a0f637fff 100644 --- a/services/privatenetworks/pom.xml +++ b/services/privatenetworks/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>privatenetworks</artifactId> <name>AWS Java SDK :: Services :: Private Networks</name> diff --git a/services/proton/pom.xml b/services/proton/pom.xml index 94f37c2cf7b4..11517bb47e0d 100644 --- a/services/proton/pom.xml +++ b/services/proton/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>proton</artifactId> <name>AWS Java SDK :: Services :: Proton</name> diff --git a/services/qbusiness/pom.xml b/services/qbusiness/pom.xml index e34c97b760c6..53ff5932bc20 100644 --- a/services/qbusiness/pom.xml +++ b/services/qbusiness/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>qbusiness</artifactId> <name>AWS Java SDK :: Services :: Q Business</name> diff --git a/services/qconnect/pom.xml b/services/qconnect/pom.xml index fd406f7410f2..357d01714223 100644 --- a/services/qconnect/pom.xml +++ b/services/qconnect/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>qconnect</artifactId> <name>AWS Java SDK :: Services :: Q Connect</name> diff --git a/services/qldb/pom.xml b/services/qldb/pom.xml index 49bfaabf7b31..c59626a9b3ad 100644 --- a/services/qldb/pom.xml +++ b/services/qldb/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>qldb</artifactId> <name>AWS Java SDK :: Services :: QLDB</name> diff --git a/services/qldbsession/pom.xml b/services/qldbsession/pom.xml index 7795dd95f6ff..b28bca347178 100644 --- a/services/qldbsession/pom.xml +++ b/services/qldbsession/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>qldbsession</artifactId> <name>AWS Java SDK :: Services :: QLDB Session</name> diff --git a/services/quicksight/pom.xml b/services/quicksight/pom.xml index ee2bb0c95ea7..6b96c3613786 100644 --- a/services/quicksight/pom.xml +++ b/services/quicksight/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>quicksight</artifactId> <name>AWS Java SDK :: Services :: QuickSight</name> diff --git a/services/ram/pom.xml b/services/ram/pom.xml index 5aabbcad7632..f6f4e37060b6 100644 --- a/services/ram/pom.xml +++ b/services/ram/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ram</artifactId> <name>AWS Java SDK :: Services :: RAM</name> diff --git a/services/rbin/pom.xml b/services/rbin/pom.xml index 10b34f9ce243..f317b09abf47 100644 --- a/services/rbin/pom.xml +++ b/services/rbin/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>rbin</artifactId> <name>AWS Java SDK :: Services :: Rbin</name> diff --git a/services/rds/pom.xml b/services/rds/pom.xml index 2d46821d3c29..1e72bb2f5233 100644 --- a/services/rds/pom.xml +++ b/services/rds/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>rds</artifactId> <name>AWS Java SDK :: Services :: Amazon RDS</name> diff --git a/services/rdsdata/pom.xml b/services/rdsdata/pom.xml index 097ca85f5bcb..5c48efc2f1c6 100644 --- a/services/rdsdata/pom.xml +++ b/services/rdsdata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>rdsdata</artifactId> <name>AWS Java SDK :: Services :: RDS Data</name> diff --git a/services/redshift/pom.xml b/services/redshift/pom.xml index 02bd87b12920..0e6eeacdcbd2 100644 --- a/services/redshift/pom.xml +++ b/services/redshift/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>redshift</artifactId> <name>AWS Java SDK :: Services :: Amazon Redshift</name> diff --git a/services/redshiftdata/pom.xml b/services/redshiftdata/pom.xml index 231d51bb2701..e1c383ad80db 100644 --- a/services/redshiftdata/pom.xml +++ b/services/redshiftdata/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>redshiftdata</artifactId> <name>AWS Java SDK :: Services :: Redshift Data</name> diff --git a/services/redshiftserverless/pom.xml b/services/redshiftserverless/pom.xml index 85a0584d1423..4cd93064b187 100644 --- a/services/redshiftserverless/pom.xml +++ b/services/redshiftserverless/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>redshiftserverless</artifactId> <name>AWS Java SDK :: Services :: Redshift Serverless</name> diff --git a/services/rekognition/pom.xml b/services/rekognition/pom.xml index b9ab9cbc3d84..c3eba80aecd3 100644 --- a/services/rekognition/pom.xml +++ b/services/rekognition/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>rekognition</artifactId> <name>AWS Java SDK :: Services :: Amazon Rekognition</name> diff --git a/services/repostspace/pom.xml b/services/repostspace/pom.xml index b99da64f0265..494328365236 100644 --- a/services/repostspace/pom.xml +++ b/services/repostspace/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>repostspace</artifactId> <name>AWS Java SDK :: Services :: Repostspace</name> diff --git a/services/resiliencehub/pom.xml b/services/resiliencehub/pom.xml index da551afbe795..f1f64534e924 100644 --- a/services/resiliencehub/pom.xml +++ b/services/resiliencehub/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>resiliencehub</artifactId> <name>AWS Java SDK :: Services :: Resiliencehub</name> diff --git a/services/resourceexplorer2/pom.xml b/services/resourceexplorer2/pom.xml index 90b95ed9d9aa..0d4ede408d83 100644 --- a/services/resourceexplorer2/pom.xml +++ b/services/resourceexplorer2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>resourceexplorer2</artifactId> <name>AWS Java SDK :: Services :: Resource Explorer 2</name> diff --git a/services/resourcegroups/pom.xml b/services/resourcegroups/pom.xml index eea438140ce3..a3b3104cca44 100644 --- a/services/resourcegroups/pom.xml +++ b/services/resourcegroups/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>resourcegroups</artifactId> diff --git a/services/resourcegroupstaggingapi/pom.xml b/services/resourcegroupstaggingapi/pom.xml index 96e566b44a71..2fb715775f65 100644 --- a/services/resourcegroupstaggingapi/pom.xml +++ b/services/resourcegroupstaggingapi/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>resourcegroupstaggingapi</artifactId> <name>AWS Java SDK :: Services :: AWS Resource Groups Tagging API</name> diff --git a/services/robomaker/pom.xml b/services/robomaker/pom.xml index 6bee881ccc35..0a94566a4512 100644 --- a/services/robomaker/pom.xml +++ b/services/robomaker/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>robomaker</artifactId> <name>AWS Java SDK :: Services :: RoboMaker</name> diff --git a/services/rolesanywhere/pom.xml b/services/rolesanywhere/pom.xml index ce0b3575dc29..306e02ac9151 100644 --- a/services/rolesanywhere/pom.xml +++ b/services/rolesanywhere/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>rolesanywhere</artifactId> <name>AWS Java SDK :: Services :: Roles Anywhere</name> diff --git a/services/route53/pom.xml b/services/route53/pom.xml index b77df3b96796..cccc3272a9f8 100644 --- a/services/route53/pom.xml +++ b/services/route53/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>route53</artifactId> <name>AWS Java SDK :: Services :: Amazon Route53</name> diff --git a/services/route53domains/pom.xml b/services/route53domains/pom.xml index b8b3afdf598a..3abe534dbaaf 100644 --- a/services/route53domains/pom.xml +++ b/services/route53domains/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>route53domains</artifactId> <name>AWS Java SDK :: Services :: Amazon Route53 Domains</name> diff --git a/services/route53profiles/pom.xml b/services/route53profiles/pom.xml index 455a070df387..c92dfa3111d9 100644 --- a/services/route53profiles/pom.xml +++ b/services/route53profiles/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>route53profiles</artifactId> <name>AWS Java SDK :: Services :: Route53 Profiles</name> diff --git a/services/route53recoverycluster/pom.xml b/services/route53recoverycluster/pom.xml index 38fe0a089623..0574956545b6 100644 --- a/services/route53recoverycluster/pom.xml +++ b/services/route53recoverycluster/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>route53recoverycluster</artifactId> <name>AWS Java SDK :: Services :: Route53 Recovery Cluster</name> diff --git a/services/route53recoverycontrolconfig/pom.xml b/services/route53recoverycontrolconfig/pom.xml index fc4cf37537e7..c773307927e6 100644 --- a/services/route53recoverycontrolconfig/pom.xml +++ b/services/route53recoverycontrolconfig/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>route53recoverycontrolconfig</artifactId> <name>AWS Java SDK :: Services :: Route53 Recovery Control Config</name> diff --git a/services/route53recoveryreadiness/pom.xml b/services/route53recoveryreadiness/pom.xml index b010ecc550f2..721ddc1131e7 100644 --- a/services/route53recoveryreadiness/pom.xml +++ b/services/route53recoveryreadiness/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>route53recoveryreadiness</artifactId> <name>AWS Java SDK :: Services :: Route53 Recovery Readiness</name> diff --git a/services/route53resolver/pom.xml b/services/route53resolver/pom.xml index c882e0e11374..0c0ea948384a 100644 --- a/services/route53resolver/pom.xml +++ b/services/route53resolver/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>route53resolver</artifactId> <name>AWS Java SDK :: Services :: Route53Resolver</name> diff --git a/services/rum/pom.xml b/services/rum/pom.xml index f2a622af0d61..6b75a5166318 100644 --- a/services/rum/pom.xml +++ b/services/rum/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>rum</artifactId> <name>AWS Java SDK :: Services :: RUM</name> diff --git a/services/s3/pom.xml b/services/s3/pom.xml index e4f59e33a0d3..2b6e1e9524c8 100644 --- a/services/s3/pom.xml +++ b/services/s3/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>s3</artifactId> <name>AWS Java SDK :: Services :: Amazon S3</name> diff --git a/services/s3/src/it/java/software/amazon/awssdk/services/s3/PutObjectIntegrationTest.java b/services/s3/src/it/java/software/amazon/awssdk/services/s3/PutObjectIntegrationTest.java index 547d95b3036c..f54d20e0487d 100644 --- a/services/s3/src/it/java/software/amazon/awssdk/services/s3/PutObjectIntegrationTest.java +++ b/services/s3/src/it/java/software/amazon/awssdk/services/s3/PutObjectIntegrationTest.java @@ -28,19 +28,27 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.CompletableFuture; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import software.amazon.awssdk.core.async.BlockingInputStreamAsyncRequestBody; import software.amazon.awssdk.core.sync.RequestBody; import software.amazon.awssdk.http.ContentStreamProvider; +import software.amazon.awssdk.services.s3.model.HeadObjectResponse; +import software.amazon.awssdk.services.s3.model.PutObjectRequest; +import software.amazon.awssdk.services.s3.model.PutObjectResponse; /** * Integration tests for {@code PutObject}. */ public class PutObjectIntegrationTest extends S3IntegrationTestBase { private static final String BUCKET = temporaryBucketName(PutObjectIntegrationTest.class); - private static final String KEY = "key"; + private static final String ASYNC_KEY = "async-key"; + private static final String SYNC_KEY = "sync-key"; + private static final byte[] CONTENT = "Hello".getBytes(StandardCharsets.UTF_8); + private static final String TEXT_CONTENT_TYPE = "text/plain"; @BeforeClass public static void setUp() throws Exception { @@ -56,13 +64,36 @@ public static void tearDown() { @Test public void objectInputStreamsAreClosed() { TestContentProvider provider = new TestContentProvider(CONTENT); - s3.putObject(r -> r.bucket(BUCKET).key(KEY), RequestBody.fromContentProvider(provider, CONTENT.length, "binary/octet-stream")); + s3.putObject(r -> r.bucket(BUCKET).key(SYNC_KEY), + RequestBody.fromContentProvider(provider, CONTENT.length, "binary/octet-stream")); for (CloseTrackingInputStream is : provider.getCreatedStreams()) { assertThat(is.isClosed()).isTrue(); } } + @Test + public void blockingInputStreamAsyncRequestBody_withContentType_isHonored() { + BlockingInputStreamAsyncRequestBody requestBody = + BlockingInputStreamAsyncRequestBody.builder() + .contentLength((long) CONTENT.length) + .contentType(TEXT_CONTENT_TYPE) + .build(); + + PutObjectRequest.Builder request = PutObjectRequest.builder() + .bucket(BUCKET) + .key(ASYNC_KEY); + + CompletableFuture<PutObjectResponse> responseFuture = s3Async.putObject(request.build(), requestBody); + requestBody.writeInputStream(new ByteArrayInputStream(CONTENT)); + responseFuture.join(); + + HeadObjectResponse response = s3Async.headObject(r -> r.bucket(BUCKET).key(ASYNC_KEY)).join(); + + assertThat(response.contentLength()).isEqualTo(CONTENT.length); + assertThat(response.contentType()).isEqualTo(TEXT_CONTENT_TYPE); + } + @Test public void s3Client_usingHttpAndDisableChunkedEncoding() { try (S3Client s3Client = s3ClientBuilder() @@ -71,7 +102,7 @@ public void s3Client_usingHttpAndDisableChunkedEncoding() { .chunkedEncodingEnabled(false) .build()) .build()) { - assertThat(s3Client.putObject(b -> b.bucket(BUCKET).key(KEY), RequestBody.fromBytes( + assertThat(s3Client.putObject(b -> b.bucket(BUCKET).key(SYNC_KEY), RequestBody.fromBytes( "helloworld".getBytes()))).isNotNull(); } } diff --git a/services/s3/src/main/resources/codegen-resources/endpoint-rule-set.json b/services/s3/src/main/resources/codegen-resources/endpoint-rule-set.json index 66392c565c4f..1ef9810cdac2 100644 --- a/services/s3/src/main/resources/codegen-resources/endpoint-rule-set.json +++ b/services/s3/src/main/resources/codegen-resources/endpoint-rule-set.json @@ -68,6 +68,11 @@ "documentation": "The S3 Prefix used to send the request. This is an optional parameter that will be set automatically for operations that are scoped to an S3 Prefix.", "type": "String" }, + "CopySource": { + "required": false, + "documentation": "The Copy Source used for Copy Object request. This is an optional parameter that will be set automatically for operations that are scoped to Copy Source.", + "type": "String" + }, "DisableAccessPoints": { "required": false, "documentation": "Internal parameter to disable Access Point Buckets", diff --git a/services/s3/src/main/resources/codegen-resources/endpoint-tests.json b/services/s3/src/main/resources/codegen-resources/endpoint-tests.json index da5ccda22e55..b6575d8e0201 100644 --- a/services/s3/src/main/resources/codegen-resources/endpoint-tests.json +++ b/services/s3/src/main/resources/codegen-resources/endpoint-tests.json @@ -1793,6 +1793,33 @@ "Key": "key" } }, + { + "documentation": "virtual addressing, aws-global region with Copy Source, and Key uses the global endpoint. Copy Source and Key parameters should not be used in endpoint evaluation.", + "expect": { + "endpoint": { + "properties": { + "authSchemes": [ + { + "name": "sigv4", + "signingName": "s3", + "signingRegion": "us-east-1", + "disableDoubleEncoding": true + } + ] + }, + "url": "https://bucket-name.s3.amazonaws.com" + } + }, + "params": { + "Region": "aws-global", + "Bucket": "bucket-name", + "UseFIPS": false, + "UseDualStack": false, + "Accelerate": false, + "CopySource": "/copy/source", + "Key": "key" + } + }, { "documentation": "virtual addressing, aws-global region with fips uses the regional fips endpoint", "expect": { diff --git a/services/s3/src/main/resources/codegen-resources/service-2.json b/services/s3/src/main/resources/codegen-resources/service-2.json index 01c7cb9632b5..5e39e04c2e65 100644 --- a/services/s3/src/main/resources/codegen-resources/service-2.json +++ b/services/s3/src/main/resources/codegen-resources/service-2.json @@ -2384,6 +2384,7 @@ "CopySource":{ "shape":"CopySource", "documentation":"<p>Specifies the source object for the copy operation. The source object can be up to 5 GB. If the source object is an object that was uploaded by using a multipart upload, the object copy will be a single part object after the source object is copied to the destination bucket.</p> <p>You specify the value of the copy source in one of two formats, depending on whether you want to access the source object through an <a href=\"https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-points.html\">access point</a>:</p> <ul> <li> <p>For objects not accessed through an access point, specify the name of the source bucket and the key of the source object, separated by a slash (/). For example, to copy the object <code>reports/january.pdf</code> from the general purpose bucket <code>awsexamplebucket</code>, use <code>awsexamplebucket/reports/january.pdf</code>. The value must be URL-encoded. To copy the object <code>reports/january.pdf</code> from the directory bucket <code>awsexamplebucket--use1-az5--x-s3</code>, use <code>awsexamplebucket--use1-az5--x-s3/reports/january.pdf</code>. The value must be URL-encoded.</p> </li> <li> <p>For objects accessed through access points, specify the Amazon Resource Name (ARN) of the object as accessed through the access point, in the format <code>arn:aws:s3:<Region>:<account-id>:accesspoint/<access-point-name>/object/<key></code>. For example, to copy the object <code>reports/january.pdf</code> through access point <code>my-access-point</code> owned by account <code>123456789012</code> in Region <code>us-west-2</code>, use the URL encoding of <code>arn:aws:s3:us-west-2:123456789012:accesspoint/my-access-point/object/reports/january.pdf</code>. The value must be URL encoded.</p> <note> <ul> <li> <p>Amazon S3 supports copy operations using Access points only when the source and destination buckets are in the same Amazon Web Services Region.</p> </li> <li> <p>Access points are not supported by directory buckets.</p> </li> </ul> </note> <p>Alternatively, for objects accessed through Amazon S3 on Outposts, specify the ARN of the object as accessed in the format <code>arn:aws:s3-outposts:<Region>:<account-id>:outpost/<outpost-id>/object/<key></code>. For example, to copy the object <code>reports/january.pdf</code> through outpost <code>my-outpost</code> owned by account <code>123456789012</code> in Region <code>us-west-2</code>, use the URL encoding of <code>arn:aws:s3-outposts:us-west-2:123456789012:outpost/my-outpost/object/reports/january.pdf</code>. The value must be URL-encoded. </p> </li> </ul> <p>If your source bucket versioning is enabled, the <code>x-amz-copy-source</code> header by default identifies the current version of an object to copy. If the current version is a delete marker, Amazon S3 behaves as if the object was deleted. To copy a different version, use the <code>versionId</code> query parameter. Specifically, append <code>?versionId=<version-id></code> to the value (for example, <code>awsexamplebucket/reports/january.pdf?versionId=QUpfdndhfd8438MNFDN93jdnJFkdmqnh893</code>). If you don't specify a version ID, Amazon S3 copies the latest version of the source object.</p> <p>If you enable versioning on the destination bucket, Amazon S3 generates a unique version ID for the copied object. This version ID is different from the version ID of the source object. Amazon S3 returns the version ID of the copied object in the <code>x-amz-version-id</code> response header in the response.</p> <p>If you do not enable versioning or suspend it on the destination bucket, the version ID that Amazon S3 generates in the <code>x-amz-version-id</code> response header is always null.</p> <note> <p> <b>Directory buckets</b> - S3 Versioning isn't enabled and supported for directory buckets.</p> </note>", + "contextParam":{"name":"CopySource"}, "location":"header", "locationName":"x-amz-copy-source" }, @@ -2444,6 +2445,7 @@ "Key":{ "shape":"ObjectKey", "documentation":"<p>The key of the destination object.</p>", + "contextParam":{"name":"Key"}, "location":"uri", "locationName":"Key" }, diff --git a/services/s3/src/test/java/software/amazon/awssdk/services/s3/ExecutionAttributeBackwardsCompatibilityTest.java b/services/s3/src/test/java/software/amazon/awssdk/services/s3/ExecutionAttributeBackwardsCompatibilityTest.java index abbae1ba6f95..a4816d22e4d0 100644 --- a/services/s3/src/test/java/software/amazon/awssdk/services/s3/ExecutionAttributeBackwardsCompatibilityTest.java +++ b/services/s3/src/test/java/software/amazon/awssdk/services/s3/ExecutionAttributeBackwardsCompatibilityTest.java @@ -75,20 +75,18 @@ public void beforeExecution(Context.BeforeExecution context, ExecutionAttributes }, AwsSignerExecutionAttribute.SERVICE_SIGNING_NAME, // Endpoint rules override signing name AwsSignerExecutionAttribute.SIGNING_REGION, // Endpoint rules override signing region - AwsSignerExecutionAttribute.AWS_CREDENTIALS, // Legacy auth strategy overrides credentials AwsSignerExecutionAttribute.SIGNER_DOUBLE_URL_ENCODE); // Endpoint rules override double-url-encode } @Test public void canSetSignerExecutionAttributes_modifyRequest() { test(attributeModifications -> new ExecutionInterceptor() { - @Override - public SdkRequest modifyRequest(Context.ModifyRequest context, ExecutionAttributes executionAttributes) { - attributeModifications.accept(executionAttributes); - return context.request(); - } - }, - AwsSignerExecutionAttribute.AWS_CREDENTIALS); // Legacy auth strategy overrides credentials + @Override + public SdkRequest modifyRequest(Context.ModifyRequest context, ExecutionAttributes executionAttributes) { + attributeModifications.accept(executionAttributes); + return context.request(); + } + }); } @Test diff --git a/services/s3control/pom.xml b/services/s3control/pom.xml index 27123025d198..50669dc76a14 100644 --- a/services/s3control/pom.xml +++ b/services/s3control/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>s3control</artifactId> <name>AWS Java SDK :: Services :: Amazon S3 Control</name> diff --git a/services/s3outposts/pom.xml b/services/s3outposts/pom.xml index 0ec96b86255a..cb50b799a1e9 100644 --- a/services/s3outposts/pom.xml +++ b/services/s3outposts/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>s3outposts</artifactId> <name>AWS Java SDK :: Services :: S3 Outposts</name> diff --git a/services/sagemaker/pom.xml b/services/sagemaker/pom.xml index a78a7fb5c520..5289bb22ffad 100644 --- a/services/sagemaker/pom.xml +++ b/services/sagemaker/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>sagemaker</artifactId> diff --git a/services/sagemaker/src/main/resources/codegen-resources/service-2.json b/services/sagemaker/src/main/resources/codegen-resources/service-2.json index 0511ba3c29ac..2687f7524c5d 100644 --- a/services/sagemaker/src/main/resources/codegen-resources/service-2.json +++ b/services/sagemaker/src/main/resources/codegen-resources/service-2.json @@ -9703,7 +9703,7 @@ }, "ModelCard":{ "shape":"ModelPackageModelCard", - "documentation":"<p>The model card associated with the model package. Since <code>ModelPackageModelCard</code> is tied to a model package, it is a specific usage of a model card and its schema is simplified compared to the schema of <code>ModelCard</code>. The <code>ModelPackageModelCard</code> schema does not include <code>model_package_details</code>, and <code>model_overview</code> is composed of the <code>model_creator</code> and <code>model_artifact</code> properties. For more information about the model card associated with the model package, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-registry-details.html\">View the Details of a Model Version</a>.</p>" + "documentation":"<p>The model card associated with the model package. Since <code>ModelPackageModelCard</code> is tied to a model package, it is a specific usage of a model card and its schema is simplified compared to the schema of <code>ModelCard</code>. The <code>ModelPackageModelCard</code> schema does not include <code>model_package_details</code>, and <code>model_overview</code> is composed of the <code>model_creator</code> and <code>model_artifact</code> properties. For more information about the model package model card schema, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-registry-details.html#model-card-schema\">Model package model card schema</a>. For more information about the model card associated with the model package, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-registry-details.html\">View the Details of a Model Version</a>.</p>" } } }, @@ -14974,7 +14974,7 @@ }, "ModelCard":{ "shape":"ModelPackageModelCard", - "documentation":"<p>The model card associated with the model package. Since <code>ModelPackageModelCard</code> is tied to a model package, it is a specific usage of a model card and its schema is simplified compared to the schema of <code>ModelCard</code>. The <code>ModelPackageModelCard</code> schema does not include <code>model_package_details</code>, and <code>model_overview</code> is composed of the <code>model_creator</code> and <code>model_artifact</code> properties. For more information about the model card associated with the model package, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-registry-details.html\">View the Details of a Model Version</a>.</p>" + "documentation":"<p>The model card associated with the model package. Since <code>ModelPackageModelCard</code> is tied to a model package, it is a specific usage of a model card and its schema is simplified compared to the schema of <code>ModelCard</code>. The <code>ModelPackageModelCard</code> schema does not include <code>model_package_details</code>, and <code>model_overview</code> is composed of the <code>model_creator</code> and <code>model_artifact</code> properties. For more information about the model package model card schema, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-registry-details.html#model-card-schema\">Model package model card schema</a>. For more information about the model card associated with the model package, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-registry-details.html\">View the Details of a Model Version</a>.</p>" } } }, @@ -27306,14 +27306,14 @@ "members":{ "ModelCardContent":{ "shape":"ModelCardContent", - "documentation":"<p>The content of the model card.</p>" + "documentation":"<p>The content of the model card. The content must follow the schema described in <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-registry-details.html#model-card-schema\">Model Package Model Card Schema</a>.</p>" }, "ModelCardStatus":{ "shape":"ModelCardStatus", "documentation":"<p>The approval status of the model card within your organization. Different organizations might have different criteria for model card review and approval.</p> <ul> <li> <p> <code>Draft</code>: The model card is a work in progress.</p> </li> <li> <p> <code>PendingReview</code>: The model card is pending review.</p> </li> <li> <p> <code>Approved</code>: The model card is approved.</p> </li> <li> <p> <code>Archived</code>: The model card is archived. No more updates can be made to the model card content. If you try to update the model card content, you will receive the message <code>Model Card is in Archived state</code>.</p> </li> </ul>" } }, - "documentation":"<p>The model card associated with the model package. Since <code>ModelPackageModelCard</code> is tied to a model package, it is a specific usage of a model card and its schema is simplified compared to the schema of <code>ModelCard</code>. The <code>ModelPackageModelCard</code> schema does not include <code>model_package_details</code>, and <code>model_overview</code> is composed of the <code>model_creator</code> and <code>model_artifact</code> properties. For more information about the model card associated with the model package, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-registry-details.html\">View the Details of a Model Version</a>.</p>" + "documentation":"<p>The model card associated with the model package. Since <code>ModelPackageModelCard</code> is tied to a model package, it is a specific usage of a model card and its schema is simplified compared to the schema of <code>ModelCard</code>. The <code>ModelPackageModelCard</code> schema does not include <code>model_package_details</code>, and <code>model_overview</code> is composed of the <code>model_creator</code> and <code>model_artifact</code> properties. For more information about the model package model card schema, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-registry-details.html#model-card-schema\">Model package model card schema</a>. For more information about the model card associated with the model package, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-registry-details.html\">View the Details of a Model Version</a>.</p>" }, "ModelPackageSecurityConfig":{ "type":"structure", @@ -30383,6 +30383,10 @@ "RoutingConfig":{ "shape":"ProductionVariantRoutingConfig", "documentation":"<p>Settings that control how the endpoint routes incoming traffic to the instances that the endpoint hosts.</p>" + }, + "InferenceAmiVersion":{ + "shape":"ProductionVariantInferenceAmiVersion", + "documentation":"<p>Specifies an option from a collection of preconfigured Amazon Machine Image (AMI) images. Each image is configured by Amazon Web Services with a set of software and driver versions. Amazon Web Services optimizes these configurations for different machine learning workloads.</p> <p>By selecting an AMI version, you can ensure that your inference environment is compatible with specific software requirements, such as CUDA driver versions, Linux kernel versions, or Amazon Web Services Neuron driver versions.</p>" } }, "documentation":"<p> Identifies a model that you want to host and the resources chosen to deploy for hosting it. If you are deploying multiple models, tell SageMaker how to distribute traffic among the models by specifying variant weights. For more information on production variants, check <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-ab-testing.html\"> Production variants</a>. </p>" @@ -30418,6 +30422,10 @@ }, "documentation":"<p>Specifies configuration for a core dump from the model container when the process crashes.</p>" }, + "ProductionVariantInferenceAmiVersion":{ + "type":"string", + "enum":["al2-ami-sagemaker-inference-gpu-2"] + }, "ProductionVariantInstanceType":{ "type":"string", "enum":[ @@ -36858,7 +36866,7 @@ }, "ModelCard":{ "shape":"ModelPackageModelCard", - "documentation":"<p>The model card associated with the model package. Since <code>ModelPackageModelCard</code> is tied to a model package, it is a specific usage of a model card and its schema is simplified compared to the schema of <code>ModelCard</code>. The <code>ModelPackageModelCard</code> schema does not include <code>model_package_details</code>, and <code>model_overview</code> is composed of the <code>model_creator</code> and <code>model_artifact</code> properties. For more information about the model card associated with the model package, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-registry-details.html\">View the Details of a Model Version</a>.</p>" + "documentation":"<p>The model card associated with the model package. Since <code>ModelPackageModelCard</code> is tied to a model package, it is a specific usage of a model card and its schema is simplified compared to the schema of <code>ModelCard</code>. The <code>ModelPackageModelCard</code> schema does not include <code>model_package_details</code>, and <code>model_overview</code> is composed of the <code>model_creator</code> and <code>model_artifact</code> properties. For more information about the model package model card schema, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-registry-details.html#model-card-schema\">Model package model card schema</a>. For more information about the model card associated with the model package, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/model-registry-details.html\">View the Details of a Model Version</a>.</p>" } } }, @@ -37725,7 +37733,7 @@ "VpcOnlyTrustedAccounts":{ "type":"list", "member":{"shape":"AccountId"}, - "max":10 + "max":20 }, "VpcSecurityGroupIds":{ "type":"list", diff --git a/services/sagemakera2iruntime/pom.xml b/services/sagemakera2iruntime/pom.xml index 79f93047e5cb..6a48515c25cf 100644 --- a/services/sagemakera2iruntime/pom.xml +++ b/services/sagemakera2iruntime/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>sagemakera2iruntime</artifactId> <name>AWS Java SDK :: Services :: SageMaker A2I Runtime</name> diff --git a/services/sagemakeredge/pom.xml b/services/sagemakeredge/pom.xml index a929b3c9888d..a87b75277653 100644 --- a/services/sagemakeredge/pom.xml +++ b/services/sagemakeredge/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>sagemakeredge</artifactId> <name>AWS Java SDK :: Services :: Sagemaker Edge</name> diff --git a/services/sagemakerfeaturestoreruntime/pom.xml b/services/sagemakerfeaturestoreruntime/pom.xml index 5e1bfc1edf66..8d8083b3987b 100644 --- a/services/sagemakerfeaturestoreruntime/pom.xml +++ b/services/sagemakerfeaturestoreruntime/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>sagemakerfeaturestoreruntime</artifactId> <name>AWS Java SDK :: Services :: Sage Maker Feature Store Runtime</name> diff --git a/services/sagemakergeospatial/pom.xml b/services/sagemakergeospatial/pom.xml index 63fd93d42845..7d1be31750b8 100644 --- a/services/sagemakergeospatial/pom.xml +++ b/services/sagemakergeospatial/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>sagemakergeospatial</artifactId> <name>AWS Java SDK :: Services :: Sage Maker Geospatial</name> diff --git a/services/sagemakermetrics/pom.xml b/services/sagemakermetrics/pom.xml index ac99ef86d81a..04f5376f96cf 100644 --- a/services/sagemakermetrics/pom.xml +++ b/services/sagemakermetrics/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>sagemakermetrics</artifactId> <name>AWS Java SDK :: Services :: Sage Maker Metrics</name> diff --git a/services/sagemakerruntime/pom.xml b/services/sagemakerruntime/pom.xml index 50edbee5fa67..6e5f4956121b 100644 --- a/services/sagemakerruntime/pom.xml +++ b/services/sagemakerruntime/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>sagemakerruntime</artifactId> <name>AWS Java SDK :: Services :: SageMaker Runtime</name> diff --git a/services/savingsplans/pom.xml b/services/savingsplans/pom.xml index 260839e9a64b..c54faf82bed2 100644 --- a/services/savingsplans/pom.xml +++ b/services/savingsplans/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>savingsplans</artifactId> <name>AWS Java SDK :: Services :: Savingsplans</name> diff --git a/services/scheduler/pom.xml b/services/scheduler/pom.xml index 05a5aa629127..7d8e103b653e 100644 --- a/services/scheduler/pom.xml +++ b/services/scheduler/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>scheduler</artifactId> <name>AWS Java SDK :: Services :: Scheduler</name> diff --git a/services/schemas/pom.xml b/services/schemas/pom.xml index 98d5f82caa60..c9d2ecd017e3 100644 --- a/services/schemas/pom.xml +++ b/services/schemas/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>schemas</artifactId> <name>AWS Java SDK :: Services :: Schemas</name> diff --git a/services/secretsmanager/pom.xml b/services/secretsmanager/pom.xml index 02805a272e52..3e9913cbe6c4 100644 --- a/services/secretsmanager/pom.xml +++ b/services/secretsmanager/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>secretsmanager</artifactId> <name>AWS Java SDK :: Services :: AWS Secrets Manager</name> diff --git a/services/securityhub/pom.xml b/services/securityhub/pom.xml index 46ec1e09413d..39381d9973c1 100644 --- a/services/securityhub/pom.xml +++ b/services/securityhub/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>securityhub</artifactId> <name>AWS Java SDK :: Services :: SecurityHub</name> diff --git a/services/securitylake/pom.xml b/services/securitylake/pom.xml index 97dbcd444e1e..ffb1b478623c 100644 --- a/services/securitylake/pom.xml +++ b/services/securitylake/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>securitylake</artifactId> <name>AWS Java SDK :: Services :: Security Lake</name> diff --git a/services/serverlessapplicationrepository/pom.xml b/services/serverlessapplicationrepository/pom.xml index 36d783050756..21d6184efedb 100644 --- a/services/serverlessapplicationrepository/pom.xml +++ b/services/serverlessapplicationrepository/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>serverlessapplicationrepository</artifactId> diff --git a/services/servicecatalog/pom.xml b/services/servicecatalog/pom.xml index 12fdc00c1913..67303613906d 100644 --- a/services/servicecatalog/pom.xml +++ b/services/servicecatalog/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>servicecatalog</artifactId> <name>AWS Java SDK :: Services :: AWS Service Catalog</name> diff --git a/services/servicecatalogappregistry/pom.xml b/services/servicecatalogappregistry/pom.xml index 824676bbdc31..2b0b6888d21f 100644 --- a/services/servicecatalogappregistry/pom.xml +++ b/services/servicecatalogappregistry/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>servicecatalogappregistry</artifactId> <name>AWS Java SDK :: Services :: Service Catalog App Registry</name> diff --git a/services/servicediscovery/pom.xml b/services/servicediscovery/pom.xml index e993773b4698..6682595ca523 100644 --- a/services/servicediscovery/pom.xml +++ b/services/servicediscovery/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>servicediscovery</artifactId> diff --git a/services/servicequotas/pom.xml b/services/servicequotas/pom.xml index 15902eade9d8..29dfdadb7829 100644 --- a/services/servicequotas/pom.xml +++ b/services/servicequotas/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>servicequotas</artifactId> <name>AWS Java SDK :: Services :: Service Quotas</name> diff --git a/services/ses/pom.xml b/services/ses/pom.xml index 7902d7dd3b4d..dbe810403868 100644 --- a/services/ses/pom.xml +++ b/services/ses/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ses</artifactId> <name>AWS Java SDK :: Services :: Amazon SES</name> diff --git a/services/sesv2/pom.xml b/services/sesv2/pom.xml index d6fd3ccdf7af..3da115b1dbd0 100644 --- a/services/sesv2/pom.xml +++ b/services/sesv2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>sesv2</artifactId> <name>AWS Java SDK :: Services :: SESv2</name> diff --git a/services/sfn/pom.xml b/services/sfn/pom.xml index 541e74718068..5e945f0dff55 100644 --- a/services/sfn/pom.xml +++ b/services/sfn/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>sfn</artifactId> <name>AWS Java SDK :: Services :: AWS Step Functions</name> diff --git a/services/shield/pom.xml b/services/shield/pom.xml index fe851cf16417..c04e38005874 100644 --- a/services/shield/pom.xml +++ b/services/shield/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>shield</artifactId> <name>AWS Java SDK :: Services :: AWS Shield</name> diff --git a/services/signer/pom.xml b/services/signer/pom.xml index 37b4163e7abe..e0db654060ae 100644 --- a/services/signer/pom.xml +++ b/services/signer/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>signer</artifactId> <name>AWS Java SDK :: Services :: Signer</name> diff --git a/services/simspaceweaver/pom.xml b/services/simspaceweaver/pom.xml index 9c7409ce89b9..9c1cc4e6d017 100644 --- a/services/simspaceweaver/pom.xml +++ b/services/simspaceweaver/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>simspaceweaver</artifactId> <name>AWS Java SDK :: Services :: Sim Space Weaver</name> diff --git a/services/sms/pom.xml b/services/sms/pom.xml index 292818ab3e99..6194be3cc1fb 100644 --- a/services/sms/pom.xml +++ b/services/sms/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>sms</artifactId> <name>AWS Java SDK :: Services :: AWS Server Migration</name> diff --git a/services/snowball/pom.xml b/services/snowball/pom.xml index 0a7257ef2337..836b3b0aaee9 100644 --- a/services/snowball/pom.xml +++ b/services/snowball/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>snowball</artifactId> <name>AWS Java SDK :: Services :: Amazon Snowball</name> diff --git a/services/snowdevicemanagement/pom.xml b/services/snowdevicemanagement/pom.xml index cea5a3d02512..d961f47e45ac 100644 --- a/services/snowdevicemanagement/pom.xml +++ b/services/snowdevicemanagement/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>snowdevicemanagement</artifactId> <name>AWS Java SDK :: Services :: Snow Device Management</name> diff --git a/services/sns/pom.xml b/services/sns/pom.xml index d4a277539200..b4791835a8fc 100644 --- a/services/sns/pom.xml +++ b/services/sns/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>sns</artifactId> <name>AWS Java SDK :: Services :: Amazon SNS</name> diff --git a/services/sns/src/main/resources/codegen-resources/service-2.json b/services/sns/src/main/resources/codegen-resources/service-2.json index c97124fa7656..fda8eca1a7af 100644 --- a/services/sns/src/main/resources/codegen-resources/service-2.json +++ b/services/sns/src/main/resources/codegen-resources/service-2.json @@ -4,12 +4,14 @@ "apiVersion":"2010-03-31", "endpointPrefix":"sns", "protocol":"query", + "protocols":["query"], "serviceAbbreviation":"Amazon SNS", "serviceFullName":"Amazon Simple Notification Service", "serviceId":"SNS", "signatureVersion":"v4", "uid":"sns-2010-03-31", - "xmlNamespace":"http://sns.amazonaws.com/doc/2010-03-31/" + "xmlNamespace":"http://sns.amazonaws.com/doc/2010-03-31/", + "auth":["aws.auth#sigv4"] }, "operations":{ "AddPermission":{ @@ -84,7 +86,7 @@ {"shape":"InternalErrorException"}, {"shape":"AuthorizationErrorException"} ], - "documentation":"<p>Creates a platform application object for one of the supported push notification services, such as APNS and GCM (Firebase Cloud Messaging), to which devices and mobile apps may register. You must specify <code>PlatformPrincipal</code> and <code>PlatformCredential</code> attributes when using the <code>CreatePlatformApplication</code> action.</p> <p> <code>PlatformPrincipal</code> and <code>PlatformCredential</code> are received from the notification service.</p> <ul> <li> <p>For <code>ADM</code>, <code>PlatformPrincipal</code> is <code>client id</code> and <code>PlatformCredential</code> is <code>client secret</code>.</p> </li> <li> <p>For <code>Baidu</code>, <code>PlatformPrincipal</code> is <code>API key</code> and <code>PlatformCredential</code> is <code>secret key</code>.</p> </li> <li> <p>For <code>APNS</code> and <code>APNS_SANDBOX</code> using certificate credentials, <code>PlatformPrincipal</code> is <code>SSL certificate</code> and <code>PlatformCredential</code> is <code>private key</code>.</p> </li> <li> <p>For <code>APNS</code> and <code>APNS_SANDBOX</code> using token credentials, <code>PlatformPrincipal</code> is <code>signing key ID</code> and <code>PlatformCredential</code> is <code>signing key</code>.</p> </li> <li> <p>For GCM (Firebase Cloud Messaging) using key credentials, there is no <code>PlatformPrincipal</code>. The <code>PlatformCredential</code> is <code>API key</code>.</p> </li> <li> <p>For GCM (Firebase Cloud Messaging) using token credentials, there is no <code>PlatformPrincipal</code>. The <code>PlatformCredential</code> is a JSON formatted private key file. When using the Amazon Web Services CLI, the file must be in string format and special characters must be ignored. To format the file correctly, Amazon SNS recommends using the following command: <code>SERVICE_JSON=`jq @json <<< cat service.json`</code>.</p> </li> <li> <p>For <code>MPNS</code>, <code>PlatformPrincipal</code> is <code>TLS certificate</code> and <code>PlatformCredential</code> is <code>private key</code>.</p> </li> <li> <p>For <code>WNS</code>, <code>PlatformPrincipal</code> is <code>Package Security Identifier</code> and <code>PlatformCredential</code> is <code>secret key</code>.</p> </li> </ul> <p>You can use the returned <code>PlatformApplicationArn</code> as an attribute for the <code>CreatePlatformEndpoint</code> action.</p>" + "documentation":"<p>Creates a platform application object for one of the supported push notification services, such as APNS and GCM (Firebase Cloud Messaging), to which devices and mobile apps may register. You must specify <code>PlatformPrincipal</code> and <code>PlatformCredential</code> attributes when using the <code>CreatePlatformApplication</code> action.</p> <p> <code>PlatformPrincipal</code> and <code>PlatformCredential</code> are received from the notification service.</p> <ul> <li> <p>For ADM, <code>PlatformPrincipal</code> is <code>client id</code> and <code>PlatformCredential</code> is <code>client secret</code>.</p> </li> <li> <p>For APNS and <code>APNS_SANDBOX</code> using certificate credentials, <code>PlatformPrincipal</code> is <code>SSL certificate</code> and <code>PlatformCredential</code> is <code>private key</code>.</p> </li> <li> <p>For APNS and <code>APNS_SANDBOX</code> using token credentials, <code>PlatformPrincipal</code> is <code>signing key ID</code> and <code>PlatformCredential</code> is <code>signing key</code>.</p> </li> <li> <p>For Baidu, <code>PlatformPrincipal</code> is <code>API key</code> and <code>PlatformCredential</code> is <code>secret key</code>.</p> </li> <li> <p>For GCM (Firebase Cloud Messaging) using key credentials, there is no <code>PlatformPrincipal</code>. The <code>PlatformCredential</code> is <code>API key</code>.</p> </li> <li> <p>For GCM (Firebase Cloud Messaging) using token credentials, there is no <code>PlatformPrincipal</code>. The <code>PlatformCredential</code> is a JSON formatted private key file. When using the Amazon Web Services CLI, the file must be in string format and special characters must be ignored. To format the file correctly, Amazon SNS recommends using the following command: <code>SERVICE_JSON=`jq @json <<< cat service.json`</code>.</p> </li> <li> <p>For MPNS, <code>PlatformPrincipal</code> is <code>TLS certificate</code> and <code>PlatformCredential</code> is <code>private key</code>.</p> </li> <li> <p>For WNS, <code>PlatformPrincipal</code> is <code>Package Security Identifier</code> and <code>PlatformCredential</code> is <code>secret key</code>.</p> </li> </ul> <p>You can use the returned <code>PlatformApplicationArn</code> as an attribute for the <code>CreatePlatformEndpoint</code> action.</p>" }, "CreatePlatformEndpoint":{ "name":"CreatePlatformEndpoint", @@ -1097,7 +1099,7 @@ }, "Attributes":{ "shape":"TopicAttributesMap", - "documentation":"<p>A map of attributes with their corresponding values.</p> <p>The following lists the names, descriptions, and values of the special request parameters that the <code>CreateTopic</code> action uses:</p> <ul> <li> <p> <code>DeliveryPolicy</code> – The policy that defines how Amazon SNS retries failed deliveries to HTTP/S endpoints.</p> </li> <li> <p> <code>DisplayName</code> – The display name to use for a topic with SMS subscriptions.</p> </li> <li> <p> <code>FifoTopic</code> – Set to true to create a FIFO topic.</p> </li> <li> <p> <code>Policy</code> – The policy that defines who can access your topic. By default, only the topic owner can publish or subscribe to the topic.</p> </li> <li> <p> <code>SignatureVersion</code> – The signature version corresponds to the hashing algorithm used while creating the signature of the notifications, subscription confirmations, or unsubscribe confirmation messages sent by Amazon SNS. By default, <code>SignatureVersion</code> is set to <code>1</code>.</p> </li> <li> <p> <code>TracingConfig</code> – Tracing mode of an Amazon SNS topic. By default <code>TracingConfig</code> is set to <code>PassThrough</code>, and the topic passes through the tracing header it receives from an Amazon SNS publisher to its subscriptions. If set to <code>Active</code>, Amazon SNS will vend X-Ray segment data to topic owner account if the sampled flag in the tracing header is true. This is only supported on standard topics.</p> </li> </ul> <p>The following attribute applies only to <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-server-side-encryption.html\">server-side encryption</a>:</p> <ul> <li> <p> <code>KmsMasterKeyId</code> – The ID of an Amazon Web Services managed customer master key (CMK) for Amazon SNS or a custom CMK. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-server-side-encryption.html#sse-key-terms\">Key Terms</a>. For more examples, see <a href=\"https://docs.aws.amazon.com/kms/latest/APIReference/API_DescribeKey.html#API_DescribeKey_RequestParameters\">KeyId</a> in the <i>Key Management Service API Reference</i>. </p> </li> </ul> <p>The following attributes apply only to <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-fifo-topics.html\">FIFO topics</a>:</p> <ul> <li> <p> <code>ArchivePolicy</code> – Adds or updates an inline policy document to archive messages stored in the specified Amazon SNS topic.</p> </li> <li> <p> <code>BeginningArchiveTime</code> – The earliest starting point at which a message in the topic’s archive can be replayed from. This point in time is based on the configured message retention period set by the topic’s message archiving policy.</p> </li> <li> <p> <code>ContentBasedDeduplication</code> – Enables content-based deduplication for FIFO topics.</p> <ul> <li> <p>By default, <code>ContentBasedDeduplication</code> is set to <code>false</code>. If you create a FIFO topic and this attribute is <code>false</code>, you must specify a value for the <code>MessageDeduplicationId</code> parameter for the <a href=\"https://docs.aws.amazon.com/sns/latest/api/API_Publish.html\">Publish</a> action. </p> </li> <li> <p>When you set <code>ContentBasedDeduplication</code> to <code>true</code>, Amazon SNS uses a SHA-256 hash to generate the <code>MessageDeduplicationId</code> using the body of the message (but not the attributes of the message).</p> <p>(Optional) To override the generated value, you can specify a value for the <code>MessageDeduplicationId</code> parameter for the <code>Publish</code> action.</p> </li> </ul> </li> </ul>" + "documentation":"<p>A map of attributes with their corresponding values.</p> <p>The following lists names, descriptions, and values of the special request parameters that the <code>CreateTopic</code> action uses:</p> <ul> <li> <p> <code>DeliveryPolicy</code> – The policy that defines how Amazon SNS retries failed deliveries to HTTP/S endpoints.</p> </li> <li> <p> <code>DisplayName</code> – The display name to use for a topic with SMS subscriptions.</p> </li> <li> <p> <code>FifoTopic</code> – Set to true to create a FIFO topic.</p> </li> <li> <p> <code>Policy</code> – The policy that defines who can access your topic. By default, only the topic owner can publish or subscribe to the topic.</p> </li> <li> <p> <code>SignatureVersion</code> – The signature version corresponds to the hashing algorithm used while creating the signature of the notifications, subscription confirmations, or unsubscribe confirmation messages sent by Amazon SNS. By default, <code>SignatureVersion</code> is set to <code>1</code>.</p> </li> <li> <p> <code>TracingConfig</code> – Tracing mode of an Amazon SNS topic. By default <code>TracingConfig</code> is set to <code>PassThrough</code>, and the topic passes through the tracing header it receives from an Amazon SNS publisher to its subscriptions. If set to <code>Active</code>, Amazon SNS will vend X-Ray segment data to topic owner account if the sampled flag in the tracing header is true. This is only supported on standard topics.</p> </li> </ul> <p>The following attribute applies only to <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-server-side-encryption.html\">server-side encryption</a>:</p> <ul> <li> <p> <code>KmsMasterKeyId</code> – The ID of an Amazon Web Services managed customer master key (CMK) for Amazon SNS or a custom CMK. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-server-side-encryption.html#sse-key-terms\">Key Terms</a>. For more examples, see <a href=\"https://docs.aws.amazon.com/kms/latest/APIReference/API_DescribeKey.html#API_DescribeKey_RequestParameters\">KeyId</a> in the <i>Key Management Service API Reference</i>. </p> </li> </ul> <p>The following attributes apply only to <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-fifo-topics.html\">FIFO topics</a>:</p> <ul> <li> <p> <code>ArchivePolicy</code> – Adds or updates an inline policy document to archive messages stored in the specified Amazon SNS topic.</p> </li> <li> <p> <code>BeginningArchiveTime</code> – The earliest starting point at which a message in the topic’s archive can be replayed from. This point in time is based on the configured message retention period set by the topic’s message archiving policy.</p> </li> <li> <p> <code>ContentBasedDeduplication</code> – Enables content-based deduplication for FIFO topics.</p> <ul> <li> <p>By default, <code>ContentBasedDeduplication</code> is set to <code>false</code>. If you create a FIFO topic and this attribute is <code>false</code>, you must specify a value for the <code>MessageDeduplicationId</code> parameter for the <a href=\"https://docs.aws.amazon.com/sns/latest/api/API_Publish.html\">Publish</a> action. </p> </li> <li> <p>When you set <code>ContentBasedDeduplication</code> to <code>true</code>, Amazon SNS uses a SHA-256 hash to generate the <code>MessageDeduplicationId</code> using the body of the message (but not the attributes of the message).</p> <p>(Optional) To override the generated value, you can specify a value for the <code>MessageDeduplicationId</code> parameter for the <code>Publish</code> action.</p> </li> </ul> </li> </ul>" }, "Tags":{ "shape":"TagList", @@ -1339,7 +1341,7 @@ "members":{ "Attributes":{ "shape":"SubscriptionAttributesMap", - "documentation":"<p>A map of the subscription's attributes. Attributes in this map include the following:</p> <ul> <li> <p> <code>ConfirmationWasAuthenticated</code> – <code>true</code> if the subscription confirmation request was authenticated.</p> </li> <li> <p> <code>DeliveryPolicy</code> – The JSON serialization of the subscription's delivery policy.</p> </li> <li> <p> <code>EffectiveDeliveryPolicy</code> – The JSON serialization of the effective delivery policy that takes into account the topic delivery policy and account system defaults.</p> </li> <li> <p> <code>FilterPolicy</code> – The filter policy JSON that is assigned to the subscription. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-message-filtering.html\">Amazon SNS Message Filtering</a> in the <i>Amazon SNS Developer Guide</i>.</p> </li> <li> <p> <code>FilterPolicyScope</code> – This attribute lets you choose the filtering scope by using one of the following string value types:</p> <ul> <li> <p> <code>MessageAttributes</code> (default) – The filter is applied on the message attributes.</p> </li> <li> <p> <code>MessageBody</code> – The filter is applied on the message body.</p> </li> </ul> </li> <li> <p> <code>Owner</code> – The Amazon Web Services account ID of the subscription's owner.</p> </li> <li> <p> <code>PendingConfirmation</code> – <code>true</code> if the subscription hasn't been confirmed. To confirm a pending subscription, call the <code>ConfirmSubscription</code> action with a confirmation token.</p> </li> <li> <p> <code>RawMessageDelivery</code> – <code>true</code> if raw message delivery is enabled for the subscription. Raw messages are free of JSON formatting and can be sent to HTTP/S and Amazon SQS endpoints.</p> </li> <li> <p> <code>RedrivePolicy</code> – When specified, sends undeliverable messages to the specified Amazon SQS dead-letter queue. Messages that can't be delivered due to client errors (for example, when the subscribed endpoint is unreachable) or server errors (for example, when the service that powers the subscribed endpoint becomes unavailable) are held in the dead-letter queue for further analysis or reprocessing.</p> </li> <li> <p> <code>SubscriptionArn</code> – The subscription's ARN.</p> </li> <li> <p> <code>TopicArn</code> – The topic ARN that the subscription is associated with.</p> </li> </ul> <p>The following attribute applies only to Amazon Kinesis Data Firehose delivery stream subscriptions:</p> <ul> <li> <p> <code>SubscriptionRoleArn</code> – The ARN of the IAM role that has the following:</p> <ul> <li> <p>Permission to write to the Kinesis Data Firehose delivery stream</p> </li> <li> <p>Amazon SNS listed as a trusted entity</p> </li> </ul> <p>Specifying a valid ARN for this attribute is required for Kinesis Data Firehose delivery stream subscriptions. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-firehose-as-subscriber.html\">Fanout to Kinesis Data Firehose delivery streams</a> in the <i>Amazon SNS Developer Guide</i>.</p> </li> </ul>" + "documentation":"<p>A map of the subscription's attributes. Attributes in this map include the following:</p> <ul> <li> <p> <code>ConfirmationWasAuthenticated</code> – <code>true</code> if the subscription confirmation request was authenticated.</p> </li> <li> <p> <code>DeliveryPolicy</code> – The JSON serialization of the subscription's delivery policy.</p> </li> <li> <p> <code>EffectiveDeliveryPolicy</code> – The JSON serialization of the effective delivery policy that takes into account the topic delivery policy and account system defaults.</p> </li> <li> <p> <code>FilterPolicy</code> – The filter policy JSON that is assigned to the subscription. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-message-filtering.html\">Amazon SNS Message Filtering</a> in the <i>Amazon SNS Developer Guide</i>.</p> </li> <li> <p> <code>FilterPolicyScope</code> – This attribute lets you choose the filtering scope by using one of the following string value types:</p> <ul> <li> <p> <code>MessageAttributes</code> (default) – The filter is applied on the message attributes.</p> </li> <li> <p> <code>MessageBody</code> – The filter is applied on the message body.</p> </li> </ul> </li> <li> <p> <code>Owner</code> – The Amazon Web Services account ID of the subscription's owner.</p> </li> <li> <p> <code>PendingConfirmation</code> – <code>true</code> if the subscription hasn't been confirmed. To confirm a pending subscription, call the <code>ConfirmSubscription</code> action with a confirmation token.</p> </li> <li> <p> <code>RawMessageDelivery</code> – <code>true</code> if raw message delivery is enabled for the subscription. Raw messages are free of JSON formatting and can be sent to HTTP/S and Amazon SQS endpoints.</p> </li> <li> <p> <code>RedrivePolicy</code> – When specified, sends undeliverable messages to the specified Amazon SQS dead-letter queue. Messages that can't be delivered due to client errors (for example, when the subscribed endpoint is unreachable) or server errors (for example, when the service that powers the subscribed endpoint becomes unavailable) are held in the dead-letter queue for further analysis or reprocessing.</p> </li> <li> <p> <code>SubscriptionArn</code> – The subscription's ARN.</p> </li> <li> <p> <code>TopicArn</code> – The topic ARN that the subscription is associated with.</p> </li> </ul> <p>The following attribute applies only to Amazon Data Firehose delivery stream subscriptions:</p> <ul> <li> <p> <code>SubscriptionRoleArn</code> – The ARN of the IAM role that has the following:</p> <ul> <li> <p>Permission to write to the Firehose delivery stream</p> </li> <li> <p>Amazon SNS listed as a trusted entity</p> </li> </ul> <p>Specifying a valid ARN for this attribute is required for Firehose delivery stream subscriptions. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-firehose-as-subscriber.html\">Fanout to Firehose delivery streams</a> in the <i>Amazon SNS Developer Guide</i>.</p> </li> </ul>" } }, "documentation":"<p>Response for GetSubscriptionAttributes action.</p>" @@ -2090,7 +2092,7 @@ }, "Subject":{ "shape":"subject", - "documentation":"<p>Optional parameter to be used as the \"Subject\" line when the message is delivered to email endpoints. This field will also be included, if present, in the standard JSON messages delivered to other endpoints.</p> <p>Constraints: Subjects must be ASCII text that begins with a letter, number, or punctuation mark; must not include line breaks or control characters; and must be less than 100 characters long.</p>" + "documentation":"<p>Optional parameter to be used as the \"Subject\" line when the message is delivered to email endpoints. This field will also be included, if present, in the standard JSON messages delivered to other endpoints.</p> <p>Constraints: Subjects must be UTF-8 text with no line breaks or control characters, and less than 100 characters long.</p>" }, "MessageStructure":{ "shape":"messageStructure", @@ -2287,7 +2289,7 @@ }, "AttributeName":{ "shape":"attributeName", - "documentation":"<p>A map of attributes with their corresponding values.</p> <p>The following lists the names, descriptions, and values of the special request parameters that this action uses:</p> <ul> <li> <p> <code>DeliveryPolicy</code> – The policy that defines how Amazon SNS retries failed deliveries to HTTP/S endpoints.</p> </li> <li> <p> <code>FilterPolicy</code> – The simple JSON object that lets your subscriber receive only a subset of messages, rather than receiving every message published to the topic.</p> </li> <li> <p> <code>FilterPolicyScope</code> – This attribute lets you choose the filtering scope by using one of the following string value types:</p> <ul> <li> <p> <code>MessageAttributes</code> (default) – The filter is applied on the message attributes.</p> </li> <li> <p> <code>MessageBody</code> – The filter is applied on the message body.</p> </li> </ul> </li> <li> <p> <code>RawMessageDelivery</code> – When set to <code>true</code>, enables raw message delivery to Amazon SQS or HTTP/S endpoints. This eliminates the need for the endpoints to process JSON formatting, which is otherwise created for Amazon SNS metadata.</p> </li> <li> <p> <code>RedrivePolicy</code> – When specified, sends undeliverable messages to the specified Amazon SQS dead-letter queue. Messages that can't be delivered due to client errors (for example, when the subscribed endpoint is unreachable) or server errors (for example, when the service that powers the subscribed endpoint becomes unavailable) are held in the dead-letter queue for further analysis or reprocessing.</p> </li> </ul> <p>The following attribute applies only to Amazon Kinesis Data Firehose delivery stream subscriptions:</p> <ul> <li> <p> <code>SubscriptionRoleArn</code> – The ARN of the IAM role that has the following:</p> <ul> <li> <p>Permission to write to the Kinesis Data Firehose delivery stream</p> </li> <li> <p>Amazon SNS listed as a trusted entity</p> </li> </ul> <p>Specifying a valid ARN for this attribute is required for Kinesis Data Firehose delivery stream subscriptions. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-firehose-as-subscriber.html\">Fanout to Kinesis Data Firehose delivery streams</a> in the <i>Amazon SNS Developer Guide</i>.</p> </li> </ul>" + "documentation":"<p>A map of attributes with their corresponding values.</p> <p>The following lists the names, descriptions, and values of the special request parameters that this action uses:</p> <ul> <li> <p> <code>DeliveryPolicy</code> – The policy that defines how Amazon SNS retries failed deliveries to HTTP/S endpoints.</p> </li> <li> <p> <code>FilterPolicy</code> – The simple JSON object that lets your subscriber receive only a subset of messages, rather than receiving every message published to the topic.</p> </li> <li> <p> <code>FilterPolicyScope</code> – This attribute lets you choose the filtering scope by using one of the following string value types:</p> <ul> <li> <p> <code>MessageAttributes</code> (default) – The filter is applied on the message attributes.</p> </li> <li> <p> <code>MessageBody</code> – The filter is applied on the message body.</p> </li> </ul> </li> <li> <p> <code>RawMessageDelivery</code> – When set to <code>true</code>, enables raw message delivery to Amazon SQS or HTTP/S endpoints. This eliminates the need for the endpoints to process JSON formatting, which is otherwise created for Amazon SNS metadata.</p> </li> <li> <p> <code>RedrivePolicy</code> – When specified, sends undeliverable messages to the specified Amazon SQS dead-letter queue. Messages that can't be delivered due to client errors (for example, when the subscribed endpoint is unreachable) or server errors (for example, when the service that powers the subscribed endpoint becomes unavailable) are held in the dead-letter queue for further analysis or reprocessing.</p> </li> </ul> <p>The following attribute applies only to Amazon Data Firehose delivery stream subscriptions:</p> <ul> <li> <p> <code>SubscriptionRoleArn</code> – The ARN of the IAM role that has the following:</p> <ul> <li> <p>Permission to write to the Firehose delivery stream</p> </li> <li> <p>Amazon SNS listed as a trusted entity</p> </li> </ul> <p>Specifying a valid ARN for this attribute is required for Firehose delivery stream subscriptions. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-firehose-as-subscriber.html\">Fanout to Firehose delivery streams</a> in the <i>Amazon SNS Developer Guide</i>.</p> </li> </ul>" }, "AttributeValue":{ "shape":"attributeValue", @@ -2353,7 +2355,7 @@ }, "Attributes":{ "shape":"SubscriptionAttributesMap", - "documentation":"<p>A map of attributes with their corresponding values.</p> <p>The following lists the names, descriptions, and values of the special request parameters that the <code>Subscribe</code> action uses:</p> <ul> <li> <p> <code>DeliveryPolicy</code> – The policy that defines how Amazon SNS retries failed deliveries to HTTP/S endpoints.</p> </li> <li> <p> <code>FilterPolicy</code> – The simple JSON object that lets your subscriber receive only a subset of messages, rather than receiving every message published to the topic.</p> </li> <li> <p> <code>FilterPolicyScope</code> – This attribute lets you choose the filtering scope by using one of the following string value types:</p> <ul> <li> <p> <code>MessageAttributes</code> (default) – The filter is applied on the message attributes.</p> </li> <li> <p> <code>MessageBody</code> – The filter is applied on the message body.</p> </li> </ul> </li> <li> <p> <code>RawMessageDelivery</code> – When set to <code>true</code>, enables raw message delivery to Amazon SQS or HTTP/S endpoints. This eliminates the need for the endpoints to process JSON formatting, which is otherwise created for Amazon SNS metadata.</p> </li> <li> <p> <code>RedrivePolicy</code> – When specified, sends undeliverable messages to the specified Amazon SQS dead-letter queue. Messages that can't be delivered due to client errors (for example, when the subscribed endpoint is unreachable) or server errors (for example, when the service that powers the subscribed endpoint becomes unavailable) are held in the dead-letter queue for further analysis or reprocessing.</p> </li> </ul> <p>The following attribute applies only to Amazon Kinesis Data Firehose delivery stream subscriptions:</p> <ul> <li> <p> <code>SubscriptionRoleArn</code> – The ARN of the IAM role that has the following:</p> <ul> <li> <p>Permission to write to the Kinesis Data Firehose delivery stream</p> </li> <li> <p>Amazon SNS listed as a trusted entity</p> </li> </ul> <p>Specifying a valid ARN for this attribute is required for Kinesis Data Firehose delivery stream subscriptions. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-firehose-as-subscriber.html\">Fanout to Kinesis Data Firehose delivery streams</a> in the <i>Amazon SNS Developer Guide</i>.</p> </li> </ul> <p>The following attributes apply only to <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-fifo-topics.html\">FIFO topics</a>:</p> <ul> <li> <p> <code>ReplayPolicy</code> – Adds or updates an inline policy document for a subscription to replay messages stored in the specified Amazon SNS topic.</p> </li> <li> <p> <code>ReplayStatus</code> – Retrieves the status of the subscription message replay, which can be one of the following:</p> <ul> <li> <p> <code>Completed</code> – The replay has successfully redelivered all messages, and is now delivering newly published messages. If an ending point was specified in the <code>ReplayPolicy</code> then the subscription will no longer receive newly published messages.</p> </li> <li> <p> <code>In progress</code> – The replay is currently replaying the selected messages.</p> </li> <li> <p> <code>Failed</code> – The replay was unable to complete.</p> </li> <li> <p> <code>Pending</code> – The default state while the replay initiates.</p> </li> </ul> </li> </ul>" + "documentation":"<p>A map of attributes with their corresponding values.</p> <p>The following lists the names, descriptions, and values of the special request parameters that the <code>Subscribe</code> action uses:</p> <ul> <li> <p> <code>DeliveryPolicy</code> – The policy that defines how Amazon SNS retries failed deliveries to HTTP/S endpoints.</p> </li> <li> <p> <code>FilterPolicy</code> – The simple JSON object that lets your subscriber receive only a subset of messages, rather than receiving every message published to the topic.</p> </li> <li> <p> <code>FilterPolicyScope</code> – This attribute lets you choose the filtering scope by using one of the following string value types:</p> <ul> <li> <p> <code>MessageAttributes</code> (default) – The filter is applied on the message attributes.</p> </li> <li> <p> <code>MessageBody</code> – The filter is applied on the message body.</p> </li> </ul> </li> <li> <p> <code>RawMessageDelivery</code> – When set to <code>true</code>, enables raw message delivery to Amazon SQS or HTTP/S endpoints. This eliminates the need for the endpoints to process JSON formatting, which is otherwise created for Amazon SNS metadata.</p> </li> <li> <p> <code>RedrivePolicy</code> – When specified, sends undeliverable messages to the specified Amazon SQS dead-letter queue. Messages that can't be delivered due to client errors (for example, when the subscribed endpoint is unreachable) or server errors (for example, when the service that powers the subscribed endpoint becomes unavailable) are held in the dead-letter queue for further analysis or reprocessing.</p> </li> </ul> <p>The following attribute applies only to Amazon Data Firehose delivery stream subscriptions:</p> <ul> <li> <p> <code>SubscriptionRoleArn</code> – The ARN of the IAM role that has the following:</p> <ul> <li> <p>Permission to write to the Firehose delivery stream</p> </li> <li> <p>Amazon SNS listed as a trusted entity</p> </li> </ul> <p>Specifying a valid ARN for this attribute is required for Firehose delivery stream subscriptions. For more information, see <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-firehose-as-subscriber.html\">Fanout to Firehose delivery streams</a> in the <i>Amazon SNS Developer Guide</i>.</p> </li> </ul> <p>The following attributes apply only to <a href=\"https://docs.aws.amazon.com/sns/latest/dg/sns-fifo-topics.html\">FIFO topics</a>:</p> <ul> <li> <p> <code>ReplayPolicy</code> – Adds or updates an inline policy document for a subscription to replay messages stored in the specified Amazon SNS topic.</p> </li> <li> <p> <code>ReplayStatus</code> – Retrieves the status of the subscription message replay, which can be one of the following:</p> <ul> <li> <p> <code>Completed</code> – The replay has successfully redelivered all messages, and is now delivering newly published messages. If an ending point was specified in the <code>ReplayPolicy</code> then the subscription will no longer receive newly published messages.</p> </li> <li> <p> <code>In progress</code> – The replay is currently replaying the selected messages.</p> </li> <li> <p> <code>Failed</code> – The replay was unable to complete.</p> </li> <li> <p> <code>Pending</code> – The default state while the replay initiates.</p> </li> </ul> </li> </ul>" }, "ReturnSubscriptionArn":{ "shape":"boolean", diff --git a/services/sqs/pom.xml b/services/sqs/pom.xml index 66051eb2f5a7..4f03deaaf49c 100644 --- a/services/sqs/pom.xml +++ b/services/sqs/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>sqs</artifactId> <name>AWS Java SDK :: Services :: Amazon SQS</name> diff --git a/services/sqs/src/main/resources/codegen-resources/service-2.json b/services/sqs/src/main/resources/codegen-resources/service-2.json index 018749d7f336..f544283aca66 100644 --- a/services/sqs/src/main/resources/codegen-resources/service-2.json +++ b/services/sqs/src/main/resources/codegen-resources/service-2.json @@ -7,6 +7,7 @@ "endpointPrefix":"sqs", "jsonVersion":"1.0", "protocol":"json", + "protocols":["json"], "serviceAbbreviation":"Amazon SQS", "serviceFullName":"Amazon Simple Queue Service", "serviceId":"SQS", @@ -346,7 +347,7 @@ {"shape":"KmsInvalidKeyUsage"}, {"shape":"InvalidAddress"} ], - "documentation":"<p>Delivers a message to the specified queue.</p> <important> <p>A message can include only XML, JSON, and unformatted text. The following Unicode characters are allowed:</p> <p> <code>#x9</code> | <code>#xA</code> | <code>#xD</code> | <code>#x20</code> to <code>#xD7FF</code> | <code>#xE000</code> to <code>#xFFFD</code> | <code>#x10000</code> to <code>#x10FFFF</code> </p> <p>Any characters not included in this list will be rejected. For more information, see the <a href=\"http://www.w3.org/TR/REC-xml/#charsets\">W3C specification for characters</a>.</p> </important>" + "documentation":"<p>Delivers a message to the specified queue.</p> <important> <p>A message can include only XML, JSON, and unformatted text. The following Unicode characters are allowed. For more information, see the <a href=\"http://www.w3.org/TR/REC-xml/#charsets\">W3C specification for characters</a>.</p> <p> <code>#x9</code> | <code>#xA</code> | <code>#xD</code> | <code>#x20</code> to <code>#xD7FF</code> | <code>#xE000</code> to <code>#xFFFD</code> | <code>#x10000</code> to <code>#x10FFFF</code> </p> <p>Amazon SQS does not throw an exception or completely reject the message if it contains invalid characters. Instead, it replaces those invalid characters with <code>U+FFFD</code> before storing the message in the queue, as long as the message body contains at least one valid character.</p> </important>" }, "SendMessageBatch":{ "name":"SendMessageBatch", @@ -375,7 +376,7 @@ {"shape":"KmsInvalidKeyUsage"}, {"shape":"InvalidAddress"} ], - "documentation":"<p>You can use <code>SendMessageBatch</code> to send up to 10 messages to the specified queue by assigning either identical or different values to each message (or by not assigning values at all). This is a batch version of <code> <a>SendMessage</a>.</code> For a FIFO queue, multiple messages within a single batch are enqueued in the order they are sent.</p> <p>The result of sending each message is reported individually in the response. Because the batch request can result in a combination of successful and unsuccessful actions, you should check for batch errors even when the call returns an HTTP status code of <code>200</code>.</p> <p>The maximum allowed individual message size and the maximum total payload size (the sum of the individual lengths of all of the batched messages) are both 256 KiB (262,144 bytes).</p> <important> <p>A message can include only XML, JSON, and unformatted text. The following Unicode characters are allowed:</p> <p> <code>#x9</code> | <code>#xA</code> | <code>#xD</code> | <code>#x20</code> to <code>#xD7FF</code> | <code>#xE000</code> to <code>#xFFFD</code> | <code>#x10000</code> to <code>#x10FFFF</code> </p> <p>Any characters not included in this list will be rejected. For more information, see the <a href=\"http://www.w3.org/TR/REC-xml/#charsets\">W3C specification for characters</a>.</p> </important> <p>If you don't specify the <code>DelaySeconds</code> parameter for an entry, Amazon SQS uses the default value for the queue.</p>" + "documentation":"<p>You can use <code>SendMessageBatch</code> to send up to 10 messages to the specified queue by assigning either identical or different values to each message (or by not assigning values at all). This is a batch version of <code> <a>SendMessage</a>.</code> For a FIFO queue, multiple messages within a single batch are enqueued in the order they are sent.</p> <p>The result of sending each message is reported individually in the response. Because the batch request can result in a combination of successful and unsuccessful actions, you should check for batch errors even when the call returns an HTTP status code of <code>200</code>.</p> <p>The maximum allowed individual message size and the maximum total payload size (the sum of the individual lengths of all of the batched messages) are both 256 KiB (262,144 bytes).</p> <important> <p>A message can include only XML, JSON, and unformatted text. The following Unicode characters are allowed. For more information, see the <a href=\"http://www.w3.org/TR/REC-xml/#charsets\">W3C specification for characters</a>.</p> <p> <code>#x9</code> | <code>#xA</code> | <code>#xD</code> | <code>#x20</code> to <code>#xD7FF</code> | <code>#xE000</code> to <code>#xFFFD</code> | <code>#x10000</code> to <code>#x10FFFF</code> </p> <p>Amazon SQS does not throw an exception or completely reject the message if it contains invalid characters. Instead, it replaces those invalid characters with <code>U+FFFD</code> before storing the message in the queue, as long as the message body contains at least one valid character.</p> </important> <p>If you don't specify the <code>DelaySeconds</code> parameter for an entry, Amazon SQS uses the default value for the queue.</p>" }, "SetQueueAttributes":{ "name":"SetQueueAttributes", @@ -1598,7 +1599,7 @@ }, "MessageBody":{ "shape":"String", - "documentation":"<p>The message to send. The minimum size is one character. The maximum size is 256 KiB.</p> <important> <p>A message can include only XML, JSON, and unformatted text. The following Unicode characters are allowed:</p> <p> <code>#x9</code> | <code>#xA</code> | <code>#xD</code> | <code>#x20</code> to <code>#xD7FF</code> | <code>#xE000</code> to <code>#xFFFD</code> | <code>#x10000</code> to <code>#x10FFFF</code> </p> <p>Any characters not included in this list will be rejected. For more information, see the <a href=\"http://www.w3.org/TR/REC-xml/#charsets\">W3C specification for characters</a>.</p> </important>" + "documentation":"<p>The message to send. The minimum size is one character. The maximum size is 256 KiB.</p> <important> <p>A message can include only XML, JSON, and unformatted text. The following Unicode characters are allowed. For more information, see the <a href=\"http://www.w3.org/TR/REC-xml/#charsets\">W3C specification for characters</a>.</p> <p> <code>#x9</code> | <code>#xA</code> | <code>#xD</code> | <code>#x20</code> to <code>#xD7FF</code> | <code>#xE000</code> to <code>#xFFFD</code> | <code>#x10000</code> to <code>#x10FFFF</code> </p> <p>Amazon SQS does not throw an exception or completely reject the message if it contains invalid characters. Instead, it replaces those invalid characters with <code>U+FFFD</code> before storing the message in the queue, as long as the message body contains at least one valid character.</p> </important>" }, "DelaySeconds":{ "shape":"NullableInteger", diff --git a/services/ssm/pom.xml b/services/ssm/pom.xml index e141bc8478e5..9d67ce116599 100644 --- a/services/ssm/pom.xml +++ b/services/ssm/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ssm</artifactId> <name>AWS Java SDK :: Services :: AWS Simple Systems Management (SSM)</name> diff --git a/services/ssmcontacts/pom.xml b/services/ssmcontacts/pom.xml index 9c5462fe3810..a3e78bb6fede 100644 --- a/services/ssmcontacts/pom.xml +++ b/services/ssmcontacts/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ssmcontacts</artifactId> <name>AWS Java SDK :: Services :: SSM Contacts</name> diff --git a/services/ssmincidents/pom.xml b/services/ssmincidents/pom.xml index 870e34ad8d3f..53d1a461bb15 100644 --- a/services/ssmincidents/pom.xml +++ b/services/ssmincidents/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ssmincidents</artifactId> <name>AWS Java SDK :: Services :: SSM Incidents</name> diff --git a/services/ssmsap/pom.xml b/services/ssmsap/pom.xml index df3e76d80dcf..00d154fd9db5 100644 --- a/services/ssmsap/pom.xml +++ b/services/ssmsap/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ssmsap</artifactId> <name>AWS Java SDK :: Services :: Ssm Sap</name> diff --git a/services/sso/pom.xml b/services/sso/pom.xml index 54b71ca6b254..12827e07e7dc 100644 --- a/services/sso/pom.xml +++ b/services/sso/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>sso</artifactId> <name>AWS Java SDK :: Services :: SSO</name> diff --git a/services/ssoadmin/pom.xml b/services/ssoadmin/pom.xml index d1fe62b9aef1..c0679815d048 100644 --- a/services/ssoadmin/pom.xml +++ b/services/ssoadmin/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ssoadmin</artifactId> <name>AWS Java SDK :: Services :: SSO Admin</name> diff --git a/services/ssooidc/pom.xml b/services/ssooidc/pom.xml index 870a2b54f346..685a538ea2d1 100644 --- a/services/ssooidc/pom.xml +++ b/services/ssooidc/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>ssooidc</artifactId> <name>AWS Java SDK :: Services :: SSO OIDC</name> diff --git a/services/storagegateway/pom.xml b/services/storagegateway/pom.xml index d778a7e5dbad..a092b3abb79f 100644 --- a/services/storagegateway/pom.xml +++ b/services/storagegateway/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>storagegateway</artifactId> <name>AWS Java SDK :: Services :: AWS Storage Gateway</name> diff --git a/services/storagegateway/src/main/resources/codegen-resources/service-2.json b/services/storagegateway/src/main/resources/codegen-resources/service-2.json index 23b61383f86f..93da2d52d468 100644 --- a/services/storagegateway/src/main/resources/codegen-resources/service-2.json +++ b/services/storagegateway/src/main/resources/codegen-resources/service-2.json @@ -5,11 +5,13 @@ "endpointPrefix":"storagegateway", "jsonVersion":"1.1", "protocol":"json", + "protocols":["json"], "serviceFullName":"AWS Storage Gateway", "serviceId":"Storage Gateway", "signatureVersion":"v4", "targetPrefix":"StorageGateway_20130630", - "uid":"storagegateway-2013-06-30" + "uid":"storagegateway-2013-06-30", + "auth":["aws.auth#sigv4"] }, "operations":{ "ActivateGateway":{ @@ -544,7 +546,7 @@ {"shape":"InvalidGatewayRequestException"}, {"shape":"InternalServerError"} ], - "documentation":"<p>Returns your gateway's weekly maintenance start time including the day and time of the week. Note that values are in terms of the gateway's time zone.</p>" + "documentation":"<p>Returns your gateway's maintenance window schedule information, with values for monthly or weekly cadence, specific day and time to begin maintenance, and which types of updates to apply. Time values returned are for the gateway's time zone.</p>" }, "DescribeNFSFileShares":{ "name":"DescribeNFSFileShares", @@ -1146,7 +1148,7 @@ {"shape":"InvalidGatewayRequestException"}, {"shape":"InternalServerError"} ], - "documentation":"<p>Updates a gateway's metadata, which includes the gateway's name and time zone. To specify which gateway to update, use the Amazon Resource Name (ARN) of the gateway in your request.</p> <note> <p>For gateways activated after September 2, 2015, the gateway's ARN contains the gateway ID rather than the gateway name. However, changing the name of the gateway has no effect on the gateway's ARN.</p> </note>" + "documentation":"<p>Updates a gateway's metadata, which includes the gateway's name, time zone, and metadata cache size. To specify which gateway to update, use the Amazon Resource Name (ARN) of the gateway in your request.</p> <note> <p>For gateways activated after September 2, 2015, the gateway's ARN contains the gateway ID rather than the gateway name. However, changing the name of the gateway has no effect on the gateway's ARN.</p> </note>" }, "UpdateGatewaySoftwareNow":{ "name":"UpdateGatewaySoftwareNow", @@ -1174,7 +1176,7 @@ {"shape":"InvalidGatewayRequestException"}, {"shape":"InternalServerError"} ], - "documentation":"<p>Updates a gateway's weekly maintenance start time information, including day and time of the week. The maintenance time is the time in your gateway's time zone.</p>" + "documentation":"<p>Updates a gateway's maintenance window schedule, with settings for monthly or weekly cadence, specific day and time to begin maintenance, and which types of updates to apply. Time configuration uses the gateway's time zone. You can pass values for a complete maintenance schedule, or update policy, or both. Previous values will persist for whichever setting you choose not to modify. If an incomplete or invalid maintenance schedule is passed, the entire request will be rejected with an error and no changes will occur.</p> <p>A complete maintenance schedule must include values for <i>both</i> <code>MinuteOfHour</code> and <code>HourOfDay</code>, and <i>either</i> <code>DayOfMonth</code> <i>or</i> <code>DayOfWeek</code>.</p> <note> <p>We recommend keeping maintenance updates turned on, except in specific use cases where the brief disruptions caused by updating the gateway could critically impact your deployment.</p> </note>" }, "UpdateNFSFileShare":{ "name":"UpdateNFSFileShare", @@ -1244,7 +1246,7 @@ {"shape":"InvalidGatewayRequestException"}, {"shape":"InternalServerError"} ], - "documentation":"<p>Updates the SMB security strategy on a file gateway. This action is only supported in file gateways.</p> <note> <p>This API is called Security level in the User Guide.</p> <p>A higher security level can affect performance of the gateway.</p> </note>" + "documentation":"<p>Updates the SMB security strategy level for an Amazon S3 file gateway. This action is only supported for Amazon S3 file gateways.</p> <note> <p>For information about configuring this setting using the Amazon Web Services console, see <a href=\"https://docs.aws.amazon.com/filegateway/latest/files3/security-strategy.html\">Setting a security level for your gateway</a> in the <i>Amazon S3 File Gateway User Guide</i>.</p> <p>A higher security strategy level can affect performance of the gateway.</p> </note>" }, "UpdateSnapshotSchedule":{ "name":"UpdateSnapshotSchedule", @@ -1623,6 +1625,13 @@ "max":10, "min":1 }, + "AutomaticUpdatePolicy":{ + "type":"string", + "enum":[ + "ALL_VERSIONS", + "EMERGENCY_VERSIONS_ONLY" + ] + }, "AvailabilityMonitorTestStatus":{ "type":"string", "enum":[ @@ -2980,14 +2989,18 @@ }, "DayOfMonth":{ "shape":"DayOfMonth", - "documentation":"<p>The day of the month component of the maintenance start time represented as an ordinal number from 1 to 28, where 1 represents the first day of the month and 28 represents the last day of the month.</p>" + "documentation":"<p>The day of the month component of the maintenance start time represented as an ordinal number from 1 to 28, where 1 represents the first day of the month. It is not possible to set the maintenance schedule to start on days 29 through 31.</p>" }, "Timezone":{ "shape":"GatewayTimezone", "documentation":"<p>A value that indicates the time zone that is set for the gateway. The start time and day of week specified should be in the time zone of the gateway.</p>" + }, + "SoftwareUpdatePreferences":{ + "shape":"SoftwareUpdatePreferences", + "documentation":"<p>A set of variables indicating the software update preferences for the gateway.</p> <p>Includes <code>AutomaticUpdatePolicy</code> field with the following inputs:</p> <p> <code>ALL_VERSIONS</code> - Enables regular gateway maintenance updates.</p> <p> <code>EMERGENCY_VERSIONS_ONLY</code> - Disables regular gateway maintenance updates.</p>" } }, - "documentation":"<p>A JSON object containing the following fields:</p> <ul> <li> <p> <a>DescribeMaintenanceStartTimeOutput$DayOfMonth</a> </p> </li> <li> <p> <a>DescribeMaintenanceStartTimeOutput$DayOfWeek</a> </p> </li> <li> <p> <a>DescribeMaintenanceStartTimeOutput$HourOfDay</a> </p> </li> <li> <p> <a>DescribeMaintenanceStartTimeOutput$MinuteOfHour</a> </p> </li> <li> <p> <a>DescribeMaintenanceStartTimeOutput$Timezone</a> </p> </li> </ul>" + "documentation":"<p>A JSON object containing the following fields:</p> <ul> <li> <p> <a>DescribeMaintenanceStartTimeOutput$SoftwareUpdatePreferences</a> </p> </li> <li> <p> <a>DescribeMaintenanceStartTimeOutput$DayOfMonth</a> </p> </li> <li> <p> <a>DescribeMaintenanceStartTimeOutput$DayOfWeek</a> </p> </li> <li> <p> <a>DescribeMaintenanceStartTimeOutput$HourOfDay</a> </p> </li> <li> <p> <a>DescribeMaintenanceStartTimeOutput$MinuteOfHour</a> </p> </li> <li> <p> <a>DescribeMaintenanceStartTimeOutput$Timezone</a> </p> </li> </ul>" }, "DescribeNFSFileSharesInput":{ "type":"structure", @@ -3056,7 +3069,7 @@ }, "SMBSecurityStrategy":{ "shape":"SMBSecurityStrategy", - "documentation":"<p>The type of security strategy that was specified for file gateway.</p> <ul> <li> <p> <code>ClientSpecified</code>: If you choose this option, requests are established based on what is negotiated by the client. This option is recommended when you want to maximize compatibility across different clients in your environment. Supported only for S3 File Gateway.</p> </li> <li> <p> <code>MandatorySigning</code>: If you use this option, File Gateway only allows connections from SMBv2 or SMBv3 clients that have signing turned on. This option works with SMB clients on Microsoft Windows Vista, Windows Server 2008, or later. </p> </li> <li> <p> <code>MandatoryEncryption</code>: If you use this option, File Gateway only allows connections from SMBv3 clients that have encryption turned on. Both 256-bit and 128-bit algorithms are allowed. This option is recommended for environments that handle sensitive data. It works with SMB clients on Microsoft Windows 8, Windows Server 2012, or later.</p> </li> <li> <p> <code>EnforceEncryption</code>: If you use this option, File Gateway only allows connections from SMBv3 clients that use 256-bit AES encryption algorithms. 128-bit algorithms are not allowed. This option is recommended for environments that handle sensitive data. It works with SMB clients on Microsoft Windows 8, Windows Server 2012, or later.</p> </li> </ul>" + "documentation":"<p>The type of security strategy that was specified for file gateway.</p> <ul> <li> <p> <code>ClientSpecified</code>: If you choose this option, requests are established based on what is negotiated by the client. This option is recommended when you want to maximize compatibility across different clients in your environment. Supported only for S3 File Gateway.</p> </li> <li> <p> <code>MandatorySigning</code>: If you choose this option, File Gateway only allows connections from SMBv2 or SMBv3 clients that have signing turned on. This option works with SMB clients on Microsoft Windows Vista, Windows Server 2008, or later. </p> </li> <li> <p> <code>MandatoryEncryption</code>: If you choose this option, File Gateway only allows connections from SMBv3 clients that have encryption turned on. Both 256-bit and 128-bit algorithms are allowed. This option is recommended for environments that handle sensitive data. It works with SMB clients on Microsoft Windows 8, Windows Server 2012, or later.</p> </li> <li> <p> <code>MandatoryEncryptionNoAes128</code>: If you choose this option, File Gateway only allows connections from SMBv3 clients that use 256-bit AES encryption algorithms. 128-bit algorithms are not allowed. This option is recommended for environments that handle sensitive data. It works with SMB clients on Microsoft Windows 8, Windows Server 2012, or later.</p> </li> </ul>" }, "FileSharesVisible":{ "shape":"Boolean", @@ -4948,6 +4961,16 @@ "type":"string", "pattern":"\\Asnap-([0-9A-Fa-f]{8}|[0-9A-Fa-f]{17})\\z" }, + "SoftwareUpdatePreferences":{ + "type":"structure", + "members":{ + "AutomaticUpdatePolicy":{ + "shape":"AutomaticUpdatePolicy", + "documentation":"<p>Indicates the automatic update policy for a gateway.</p> <p> <code>ALL_VERSIONS</code> - Enables regular gateway maintenance updates.</p> <p> <code>EMERGENCY_VERSIONS_ONLY</code> - Disables regular gateway maintenance updates.</p>" + } + }, + "documentation":"<p>A set of variables indicating the software update preferences for the gateway.</p>" + }, "SoftwareUpdatesEndDate":{ "type":"string", "max":25, @@ -5511,7 +5534,7 @@ }, "GatewayCapacity":{ "shape":"GatewayCapacity", - "documentation":"<p>Specifies the size of the gateway's metadata cache.</p>" + "documentation":"<p>Specifies the size of the gateway's metadata cache. This setting impacts gateway performance and hardware recommendations. For more information, see <a href=\"https://docs.aws.amazon.com/filegateway/latest/files3/performance-multiple-file-shares.html\">Performance guidance for gateways with multiple file shares</a> in the <i>Amazon S3 File Gateway User Guide</i>.</p>" } } }, @@ -5543,11 +5566,7 @@ }, "UpdateMaintenanceStartTimeInput":{ "type":"structure", - "required":[ - "GatewayARN", - "HourOfDay", - "MinuteOfHour" - ], + "required":["GatewayARN"], "members":{ "GatewayARN":{"shape":"GatewayARN"}, "HourOfDay":{ @@ -5560,14 +5579,18 @@ }, "DayOfWeek":{ "shape":"DayOfWeek", - "documentation":"<p>The day of the week component of the maintenance start time week represented as an ordinal number from 0 to 6, where 0 represents Sunday and 6 Saturday.</p>" + "documentation":"<p>The day of the week component of the maintenance start time week represented as an ordinal number from 0 to 6, where 0 represents Sunday and 6 represents Saturday.</p>" }, "DayOfMonth":{ "shape":"DayOfMonth", - "documentation":"<p>The day of the month component of the maintenance start time represented as an ordinal number from 1 to 28, where 1 represents the first day of the month and 28 represents the last day of the month.</p>" + "documentation":"<p>The day of the month component of the maintenance start time represented as an ordinal number from 1 to 28, where 1 represents the first day of the month. It is not possible to set the maintenance schedule to start on days 29 through 31.</p>" + }, + "SoftwareUpdatePreferences":{ + "shape":"SoftwareUpdatePreferences", + "documentation":"<p>A set of variables indicating the software update preferences for the gateway.</p> <p>Includes <code>AutomaticUpdatePolicy</code> field with the following inputs:</p> <p> <code>ALL_VERSIONS</code> - Enables regular gateway maintenance updates.</p> <p> <code>EMERGENCY_VERSIONS_ONLY</code> - Disables regular gateway maintenance updates.</p>" } }, - "documentation":"<p>A JSON object containing the following fields:</p> <ul> <li> <p> <a>UpdateMaintenanceStartTimeInput$DayOfMonth</a> </p> </li> <li> <p> <a>UpdateMaintenanceStartTimeInput$DayOfWeek</a> </p> </li> <li> <p> <a>UpdateMaintenanceStartTimeInput$HourOfDay</a> </p> </li> <li> <p> <a>UpdateMaintenanceStartTimeInput$MinuteOfHour</a> </p> </li> </ul>" + "documentation":"<p>A JSON object containing the following fields:</p> <ul> <li> <p> <a>UpdateMaintenanceStartTimeInput$SoftwareUpdatePreferences</a> </p> </li> <li> <p> <a>UpdateMaintenanceStartTimeInput$DayOfMonth</a> </p> </li> <li> <p> <a>UpdateMaintenanceStartTimeInput$DayOfWeek</a> </p> </li> <li> <p> <a>UpdateMaintenanceStartTimeInput$HourOfDay</a> </p> </li> <li> <p> <a>UpdateMaintenanceStartTimeInput$MinuteOfHour</a> </p> </li> </ul>" }, "UpdateMaintenanceStartTimeOutput":{ "type":"structure", @@ -5796,7 +5819,7 @@ "GatewayARN":{"shape":"GatewayARN"}, "SMBSecurityStrategy":{ "shape":"SMBSecurityStrategy", - "documentation":"<p>Specifies the type of security strategy.</p> <p>ClientSpecified: if you use this option, requests are established based on what is negotiated by the client. This option is recommended when you want to maximize compatibility across different clients in your environment. Supported only in S3 File Gateway.</p> <p>MandatorySigning: if you use this option, file gateway only allows connections from SMBv2 or SMBv3 clients that have signing enabled. This option works with SMB clients on Microsoft Windows Vista, Windows Server 2008 or newer.</p> <p>MandatoryEncryption: if you use this option, file gateway only allows connections from SMBv3 clients that have encryption enabled. This option is highly recommended for environments that handle sensitive data. This option works with SMB clients on Microsoft Windows 8, Windows Server 2012 or newer.</p>" + "documentation":"<p>Specifies the type of security strategy.</p> <p> <code>ClientSpecified</code>: If you choose this option, requests are established based on what is negotiated by the client. This option is recommended when you want to maximize compatibility across different clients in your environment. Supported only for S3 File Gateway.</p> <p> <code>MandatorySigning</code>: If you choose this option, File Gateway only allows connections from SMBv2 or SMBv3 clients that have signing enabled. This option works with SMB clients on Microsoft Windows Vista, Windows Server 2008 or newer.</p> <p> <code>MandatoryEncryption</code>: If you choose this option, File Gateway only allows connections from SMBv3 clients that have encryption enabled. This option is recommended for environments that handle sensitive data. This option works with SMB clients on Microsoft Windows 8, Windows Server 2012 or newer.</p> <p> <code>MandatoryEncryptionNoAes128</code>: If you choose this option, File Gateway only allows connections from SMBv3 clients that use 256-bit AES encryption algorithms. 128-bit algorithms are not allowed. This option is recommended for environments that handle sensitive data. It works with SMB clients on Microsoft Windows 8, Windows Server 2012, or later.</p>" } } }, diff --git a/services/sts/pom.xml b/services/sts/pom.xml index b5218e010441..34ef6ceb7ce5 100644 --- a/services/sts/pom.xml +++ b/services/sts/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>sts</artifactId> <name>AWS Java SDK :: Services :: AWS STS</name> diff --git a/services/supplychain/pom.xml b/services/supplychain/pom.xml index 6fc45935b3b7..38ca71f95a6f 100644 --- a/services/supplychain/pom.xml +++ b/services/supplychain/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>supplychain</artifactId> <name>AWS Java SDK :: Services :: Supply Chain</name> diff --git a/services/support/pom.xml b/services/support/pom.xml index cb3d5937238c..a08878736456 100644 --- a/services/support/pom.xml +++ b/services/support/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>support</artifactId> <name>AWS Java SDK :: Services :: AWS Support</name> diff --git a/services/supportapp/pom.xml b/services/supportapp/pom.xml index f35ffd7cf035..fdf9fb91736e 100644 --- a/services/supportapp/pom.xml +++ b/services/supportapp/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>supportapp</artifactId> <name>AWS Java SDK :: Services :: Support App</name> diff --git a/services/swf/pom.xml b/services/swf/pom.xml index 107cdb2f57f3..33809c9fa9f8 100644 --- a/services/swf/pom.xml +++ b/services/swf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>swf</artifactId> <name>AWS Java SDK :: Services :: Amazon SWF</name> diff --git a/services/synthetics/pom.xml b/services/synthetics/pom.xml index 2360eace4356..922c1ce0a75c 100644 --- a/services/synthetics/pom.xml +++ b/services/synthetics/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>synthetics</artifactId> <name>AWS Java SDK :: Services :: Synthetics</name> diff --git a/services/taxsettings/pom.xml b/services/taxsettings/pom.xml index 1b57ca690174..e18c9d9ece64 100644 --- a/services/taxsettings/pom.xml +++ b/services/taxsettings/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>taxsettings</artifactId> <name>AWS Java SDK :: Services :: Tax Settings</name> diff --git a/services/textract/pom.xml b/services/textract/pom.xml index 2a2c1d4a558f..f60c033c9976 100644 --- a/services/textract/pom.xml +++ b/services/textract/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>textract</artifactId> <name>AWS Java SDK :: Services :: Textract</name> diff --git a/services/timestreaminfluxdb/pom.xml b/services/timestreaminfluxdb/pom.xml index 4c3a13531afd..8a672faa5b54 100644 --- a/services/timestreaminfluxdb/pom.xml +++ b/services/timestreaminfluxdb/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>timestreaminfluxdb</artifactId> <name>AWS Java SDK :: Services :: Timestream Influx DB</name> diff --git a/services/timestreamquery/pom.xml b/services/timestreamquery/pom.xml index 28cf8f0a6cd8..ce8fb7060d87 100644 --- a/services/timestreamquery/pom.xml +++ b/services/timestreamquery/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>timestreamquery</artifactId> <name>AWS Java SDK :: Services :: Timestream Query</name> diff --git a/services/timestreamwrite/pom.xml b/services/timestreamwrite/pom.xml index cd5970265b3b..a42c6b77648a 100644 --- a/services/timestreamwrite/pom.xml +++ b/services/timestreamwrite/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>timestreamwrite</artifactId> <name>AWS Java SDK :: Services :: Timestream Write</name> diff --git a/services/tnb/pom.xml b/services/tnb/pom.xml index a90c08b0813b..c58321326b21 100644 --- a/services/tnb/pom.xml +++ b/services/tnb/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>tnb</artifactId> <name>AWS Java SDK :: Services :: Tnb</name> diff --git a/services/transcribe/pom.xml b/services/transcribe/pom.xml index e9343e2b2d07..1469033963fa 100644 --- a/services/transcribe/pom.xml +++ b/services/transcribe/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>transcribe</artifactId> <name>AWS Java SDK :: Services :: Transcribe</name> diff --git a/services/transcribestreaming/pom.xml b/services/transcribestreaming/pom.xml index 5b9361ecc962..b3917bb7e0f2 100644 --- a/services/transcribestreaming/pom.xml +++ b/services/transcribestreaming/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>transcribestreaming</artifactId> <name>AWS Java SDK :: Services :: AWS Transcribe Streaming</name> diff --git a/services/transfer/pom.xml b/services/transfer/pom.xml index 74490b4fb4f6..47e9b98cabb5 100644 --- a/services/transfer/pom.xml +++ b/services/transfer/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>transfer</artifactId> <name>AWS Java SDK :: Services :: Transfer</name> diff --git a/services/translate/pom.xml b/services/translate/pom.xml index 2d95ac9759b3..4cf96190fb88 100644 --- a/services/translate/pom.xml +++ b/services/translate/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>translate</artifactId> diff --git a/services/trustedadvisor/pom.xml b/services/trustedadvisor/pom.xml index 7ff589495f79..0410c71a1a64 100644 --- a/services/trustedadvisor/pom.xml +++ b/services/trustedadvisor/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>trustedadvisor</artifactId> <name>AWS Java SDK :: Services :: Trusted Advisor</name> diff --git a/services/verifiedpermissions/pom.xml b/services/verifiedpermissions/pom.xml index ca079a1acdc4..0f041c0c123a 100644 --- a/services/verifiedpermissions/pom.xml +++ b/services/verifiedpermissions/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>verifiedpermissions</artifactId> <name>AWS Java SDK :: Services :: Verified Permissions</name> diff --git a/services/verifiedpermissions/src/main/resources/codegen-resources/service-2.json b/services/verifiedpermissions/src/main/resources/codegen-resources/service-2.json index 0f70e2ca2669..4c63db0d3797 100644 --- a/services/verifiedpermissions/src/main/resources/codegen-resources/service-2.json +++ b/services/verifiedpermissions/src/main/resources/codegen-resources/service-2.json @@ -65,7 +65,7 @@ {"shape":"ThrottlingException"}, {"shape":"InternalServerException"} ], - "documentation":"<p>Creates a reference to an Amazon Cognito user pool as an external identity provider (IdP). </p> <p>After you create an identity source, you can use the identities provided by the IdP as proxies for the principal in authorization queries that use the <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_IsAuthorizedWithToken.html\">IsAuthorizedWithToken</a> operation. These identities take the form of tokens that contain claims about the user, such as IDs, attributes and group memberships. Amazon Cognito provides both identity tokens and access tokens, and Verified Permissions can use either or both. Any combination of identity and access tokens results in the same Cedar principal. Verified Permissions automatically translates the information about the identities into the standard Cedar attributes that can be evaluated by your policies. Because the Amazon Cognito identity and access tokens can contain different information, the tokens you choose to use determine which principal attributes are available to access when evaluating Cedar policies.</p> <important> <p>If you delete a Amazon Cognito user pool or user, tokens from that deleted pool or that deleted user continue to be usable until they expire.</p> </important> <note> <p>To reference a user from this identity source in your Cedar policies, use the following syntax.</p> <p> <i>IdentityType::\"<CognitoUserPoolIdentifier>|<CognitoClientId></i> </p> <p>Where <code>IdentityType</code> is the string that you provide to the <code>PrincipalEntityType</code> parameter for this operation. The <code>CognitoUserPoolId</code> and <code>CognitoClientId</code> are defined by the Amazon Cognito user pool.</p> </note> <note> <p>Verified Permissions is <i> <a href=\"https://wikipedia.org/wiki/Eventual_consistency\">eventually consistent</a> </i>. It can take a few seconds for a new or changed element to propagate through the service and be visible in the results of other Verified Permissions operations.</p> </note>", + "documentation":"<p>Adds an identity source to a policy store–an Amazon Cognito user pool or OpenID Connect (OIDC) identity provider (IdP). </p> <p>After you create an identity source, you can use the identities provided by the IdP as proxies for the principal in authorization queries that use the <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_IsAuthorizedWithToken.html\">IsAuthorizedWithToken</a> or <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_BatchIsAuthorizedWithToken.html\">BatchIsAuthorizedWithToken</a> API operations. These identities take the form of tokens that contain claims about the user, such as IDs, attributes and group memberships. Identity sources provide identity (ID) tokens and access tokens. Verified Permissions derives information about your user and session from token claims. Access tokens provide action <code>context</code> to your policies, and ID tokens provide principal <code>Attributes</code>.</p> <important> <p>Tokens from an identity source user continue to be usable until they expire. Token revocation and resource deletion have no effect on the validity of a token in your policy store</p> </important> <note> <p>To reference a user from this identity source in your Cedar policies, refer to the following syntax examples.</p> <ul> <li> <p>Amazon Cognito user pool: <code>Namespace::[Entity type]::[User pool ID]|[user principal attribute]</code>, for example <code>MyCorp::User::us-east-1_EXAMPLE|a1b2c3d4-5678-90ab-cdef-EXAMPLE11111</code>.</p> </li> <li> <p>OpenID Connect (OIDC) provider: <code>Namespace::[Entity type]::[principalIdClaim]|[user principal attribute]</code>, for example <code>MyCorp::User::MyOIDCProvider|a1b2c3d4-5678-90ab-cdef-EXAMPLE22222</code>.</p> </li> </ul> </note> <note> <p>Verified Permissions is <i> <a href=\"https://wikipedia.org/wiki/Eventual_consistency\">eventually consistent</a> </i>. It can take a few seconds for a new or changed element to propagate through the service and be visible in the results of other Verified Permissions operations.</p> </note>", "idempotent":true }, "CreatePolicy":{ @@ -318,7 +318,7 @@ {"shape":"ThrottlingException"}, {"shape":"InternalServerException"} ], - "documentation":"<p>Makes an authorization decision about a service request described in the parameters. The principal in this request comes from an external identity source in the form of an identity token formatted as a <a href=\"https://wikipedia.org/wiki/JSON_Web_Token\">JSON web token (JWT)</a>. The information in the parameters can also define additional context that Verified Permissions can include in the evaluation. The request is evaluated against all matching policies in the specified policy store. The result of the decision is either <code>Allow</code> or <code>Deny</code>, along with a list of the policies that resulted in the decision.</p> <p>At this time, Verified Permissions accepts tokens from only Amazon Cognito.</p> <p>Verified Permissions validates each token that is specified in a request by checking its expiration date and its signature.</p> <important> <p>If you delete a Amazon Cognito user pool or user, tokens from that deleted pool or that deleted user continue to be usable until they expire.</p> </important>" + "documentation":"<p>Makes an authorization decision about a service request described in the parameters. The principal in this request comes from an external identity source in the form of an identity token formatted as a <a href=\"https://wikipedia.org/wiki/JSON_Web_Token\">JSON web token (JWT)</a>. The information in the parameters can also define additional context that Verified Permissions can include in the evaluation. The request is evaluated against all matching policies in the specified policy store. The result of the decision is either <code>Allow</code> or <code>Deny</code>, along with a list of the policies that resulted in the decision.</p> <p>At this time, Verified Permissions accepts tokens from only Amazon Cognito.</p> <p>Verified Permissions validates each token that is specified in a request by checking its expiration date and its signature.</p> <important> <p>Tokens from an identity source user continue to be usable until they expire. Token revocation and resource deletion have no effect on the validity of a token in your policy store</p> </important>" }, "ListIdentitySources":{ "name":"ListIdentitySources", @@ -423,7 +423,7 @@ {"shape":"ThrottlingException"}, {"shape":"InternalServerException"} ], - "documentation":"<p>Updates the specified identity source to use a new identity provider (IdP) source, or to change the mapping of identities from the IdP to a different principal entity type.</p> <note> <p>Verified Permissions is <i> <a href=\"https://wikipedia.org/wiki/Eventual_consistency\">eventually consistent</a> </i>. It can take a few seconds for a new or changed element to propagate through the service and be visible in the results of other Verified Permissions operations.</p> </note>", + "documentation":"<p>Updates the specified identity source to use a new identity provider (IdP), or to change the mapping of identities from the IdP to a different principal entity type.</p> <note> <p>Verified Permissions is <i> <a href=\"https://wikipedia.org/wiki/Eventual_consistency\">eventually consistent</a> </i>. It can take a few seconds for a new or changed element to propagate through the service and be visible in the results of other Verified Permissions operations.</p> </note>", "idempotent":true }, "UpdatePolicy":{ @@ -562,6 +562,17 @@ "documentation":"<p>The value of an attribute.</p> <p>Contains information about the runtime context for a request for which an authorization decision is made. </p> <p>This data type is used as a member of the <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_ContextDefinition.html\">ContextDefinition</a> structure which is uses as a request parameter for the <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_IsAuthorized.html\">IsAuthorized</a>, <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_BatchIsAuthorized.html\">BatchIsAuthorized</a>, and <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_IsAuthorizedWithToken.html\">IsAuthorizedWithToken</a> operations.</p>", "union":true }, + "Audience":{ + "type":"string", + "max":255, + "min":1 + }, + "Audiences":{ + "type":"list", + "member":{"shape":"Audience"}, + "max":255, + "min":1 + }, "BatchIsAuthorizedInput":{ "type":"structure", "required":[ @@ -759,6 +770,11 @@ "box":true, "sensitive":true }, + "Claim":{ + "type":"string", + "min":1, + "sensitive":true + }, "ClientId":{ "type":"string", "max":255, @@ -820,7 +836,7 @@ "documentation":"<p>The type of entity that a policy store maps to groups from an Amazon Cognito user pool identity source.</p>" } }, - "documentation":"<p>The configuration for an identity source that represents a connection to an Amazon Cognito user pool used as an identity provider for Verified Permissions.</p> <p>This data type is used as a field that is part of an <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_Configuration.html\">Configuration</a> structure that is used as a parameter to <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_CreateIdentitySource.html\">CreateIdentitySource</a>.</p> <p>Example:<code>\"CognitoUserPoolConfiguration\":{\"UserPoolArn\":\"arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_1a2b3c4d5\",\"ClientIds\": [\"a1b2c3d4e5f6g7h8i9j0kalbmc\"],\"groupConfiguration\": {\"groupEntityType\": \"MyCorp::Group\"}}</code> </p>" + "documentation":"<p>The configuration for an identity source that represents a connection to an Amazon Cognito user pool used as an identity provider for Verified Permissions.</p> <p>This data type part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_Configuration.html\">Configuration</a> structure that is used as a parameter to <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_CreateIdentitySource.html\">CreateIdentitySource</a>.</p> <p>Example:<code>\"CognitoUserPoolConfiguration\":{\"UserPoolArn\":\"arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_1a2b3c4d5\",\"ClientIds\": [\"a1b2c3d4e5f6g7h8i9j0kalbmc\"],\"groupConfiguration\": {\"groupEntityType\": \"MyCorp::Group\"}}</code> </p>" }, "CognitoUserPoolConfigurationDetail":{ "type":"structure", @@ -882,9 +898,13 @@ "cognitoUserPoolConfiguration":{ "shape":"CognitoUserPoolConfiguration", "documentation":"<p>Contains configuration details of a Amazon Cognito user pool that Verified Permissions can use as a source of authenticated identities as entities. It specifies the <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Name (ARN)</a> of a Amazon Cognito user pool and one or more application client IDs.</p> <p>Example: <code>\"configuration\":{\"cognitoUserPoolConfiguration\":{\"userPoolArn\":\"arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_1a2b3c4d5\",\"clientIds\": [\"a1b2c3d4e5f6g7h8i9j0kalbmc\"],\"groupConfiguration\": {\"groupEntityType\": \"MyCorp::Group\"}}}</code> </p>" + }, + "openIdConnectConfiguration":{ + "shape":"OpenIdConnectConfiguration", + "documentation":"<p>Contains configuration details of an OpenID Connect (OIDC) identity provider, or identity source, that Verified Permissions can use to generate entities from authenticated identities. It specifies the issuer URL, token type that you want to use, and policy store entity details.</p> <p>Example:<code>\"configuration\":{\"openIdConnectConfiguration\":{\"issuer\":\"https://auth.example.com\",\"tokenSelection\":{\"accessTokenOnly\":{\"audiences\":[\"https://myapp.example.com\",\"https://myapp2.example.com\"],\"principalIdClaim\":\"sub\"}},\"entityIdPrefix\":\"MyOIDCProvider\",\"groupConfiguration\":{\"groupClaim\":\"groups\",\"groupEntityType\":\"MyCorp::UserGroup\"}}}</code> </p>" } }, - "documentation":"<p>Contains configuration information used when creating a new identity source.</p> <note> <p>At this time, the only valid member of this structure is a Amazon Cognito user pool configuration.</p> <p>Specifies a <code>userPoolArn</code>, a <code>groupConfiguration</code>, and a <code>ClientId</code>.</p> </note> <p>This data type is used as a request parameter for the <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_CreateIdentitySource.html\">CreateIdentitySource</a> operation.</p>", + "documentation":"<p>Contains configuration information used when creating a new identity source.</p> <p>This data type is used as a request parameter for the <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_CreateIdentitySource.html\">CreateIdentitySource</a> operation.</p>", "union":true }, "ConfigurationDetail":{ @@ -893,6 +913,10 @@ "cognitoUserPoolConfiguration":{ "shape":"CognitoUserPoolConfigurationDetail", "documentation":"<p>Contains configuration details of a Amazon Cognito user pool that Verified Permissions can use as a source of authenticated identities as entities. It specifies the <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Name (ARN)</a> of a Amazon Cognito user pool, the policy store entity that you want to assign to user groups, and one or more application client IDs.</p> <p>Example: <code>\"configuration\":{\"cognitoUserPoolConfiguration\":{\"userPoolArn\":\"arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_1a2b3c4d5\",\"clientIds\": [\"a1b2c3d4e5f6g7h8i9j0kalbmc\"],\"groupConfiguration\": {\"groupEntityType\": \"MyCorp::Group\"}}}</code> </p>" + }, + "openIdConnectConfiguration":{ + "shape":"OpenIdConnectConfigurationDetail", + "documentation":"<p>Contains configuration details of an OpenID Connect (OIDC) identity provider, or identity source, that Verified Permissions can use to generate entities from authenticated identities. It specifies the issuer URL, token type that you want to use, and policy store entity details.</p> <p>Example:<code>\"configuration\":{\"openIdConnectConfiguration\":{\"issuer\":\"https://auth.example.com\",\"tokenSelection\":{\"accessTokenOnly\":{\"audiences\":[\"https://myapp.example.com\",\"https://myapp2.example.com\"],\"principalIdClaim\":\"sub\"}},\"entityIdPrefix\":\"MyOIDCProvider\",\"groupConfiguration\":{\"groupClaim\":\"groups\",\"groupEntityType\":\"MyCorp::UserGroup\"}}}</code> </p>" } }, "documentation":"<p>Contains configuration information about an identity source.</p> <p>This data type is a response parameter to the <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_GetIdentitySource.html\">GetIdentitySource</a> operation.</p>", @@ -904,6 +928,10 @@ "cognitoUserPoolConfiguration":{ "shape":"CognitoUserPoolConfigurationItem", "documentation":"<p>Contains configuration details of a Amazon Cognito user pool that Verified Permissions can use as a source of authenticated identities as entities. It specifies the <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Amazon Resource Name (ARN)</a> of a Amazon Cognito user pool, the policy store entity that you want to assign to user groups, and one or more application client IDs.</p> <p>Example: <code>\"configuration\":{\"cognitoUserPoolConfiguration\":{\"userPoolArn\":\"arn:aws:cognito-idp:us-east-1:123456789012:userpool/us-east-1_1a2b3c4d5\",\"clientIds\": [\"a1b2c3d4e5f6g7h8i9j0kalbmc\"],\"groupConfiguration\": {\"groupEntityType\": \"MyCorp::Group\"}}}</code> </p>" + }, + "openIdConnectConfiguration":{ + "shape":"OpenIdConnectConfigurationItem", + "documentation":"<p>Contains configuration details of an OpenID Connect (OIDC) identity provider, or identity source, that Verified Permissions can use to generate entities from authenticated identities. It specifies the issuer URL, token type that you want to use, and policy store entity details.</p> <p>Example:<code>\"configuration\":{\"openIdConnectConfiguration\":{\"issuer\":\"https://auth.example.com\",\"tokenSelection\":{\"accessTokenOnly\":{\"audiences\":[\"https://myapp.example.com\",\"https://myapp2.example.com\"],\"principalIdClaim\":\"sub\"}},\"entityIdPrefix\":\"MyOIDCProvider\",\"groupConfiguration\":{\"groupClaim\":\"groups\",\"groupEntityType\":\"MyCorp::UserGroup\"}}}</code> </p>" } }, "documentation":"<p>Contains configuration information about an identity source.</p> <p>This data type is a response parameter to the <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_ListIdentitySources.html\">ListIdentitySources</a> operation.</p>", @@ -939,7 +967,8 @@ "ContextMap":{ "type":"map", "key":{"shape":"String"}, - "value":{"shape":"AttributeValue"} + "value":{"shape":"AttributeValue"}, + "sensitive":true }, "CreateIdentitySourceInput":{ "type":"structure", @@ -959,7 +988,7 @@ }, "configuration":{ "shape":"Configuration", - "documentation":"<p>Specifies the details required to communicate with the identity provider (IdP) associated with this identity source.</p> <note> <p>At this time, the only valid member of this structure is a Amazon Cognito user pool configuration.</p> <p>You must specify a <code>UserPoolArn</code>, and optionally, a <code>ClientId</code>.</p> </note>" + "documentation":"<p>Specifies the details required to communicate with the identity provider (IdP) associated with this identity source.</p>" }, "principalEntityType":{ "shape":"PrincipalEntityType", @@ -1295,6 +1324,12 @@ "pattern":".*", "sensitive":true }, + "EntityIdPrefix":{ + "type":"string", + "max":100, + "min":1, + "sensitive":true + }, "EntityIdentifier":{ "type":"structure", "required":[ @@ -1327,7 +1362,7 @@ }, "parents":{ "shape":"ParentList", - "documentation":"<p>The parents in the hierarchy that contains the entity.</p>" + "documentation":"<p>The parent entities in the hierarchy that contains the entity. A principal or resource entity can be defined with at most 99 <i>transitive parents</i> per authorization request. </p> <p>A transitive parent is an entity in the hierarchy of entities including all direct parents, and parents of parents. For example, a user can be a member of 91 groups if one of those groups is a member of eight groups, for a total of 100: one entity, 91 entity parents, and eight parents of parents. </p>" } }, "documentation":"<p>Contains information about an entity that can be referenced in a Cedar policy.</p> <p>This data type is used as one of the fields in the <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_EntitiesDefinition.html\">EntitiesDefinition</a> structure.</p> <p> <code>{ \"identifier\": { \"entityType\": \"Photo\", \"entityId\": \"VacationPhoto94.jpg\" }, \"attributes\": {}, \"parents\": [ { \"entityType\": \"Album\", \"entityId\": \"alice_folder\" } ] }</code> </p>" @@ -2081,15 +2116,274 @@ "min":1, "pattern":"[A-Za-z0-9-_=+/\\.]*" }, + "OpenIdConnectAccessTokenConfiguration":{ + "type":"structure", + "members":{ + "principalIdClaim":{ + "shape":"Claim", + "documentation":"<p>The claim that determines the principal in OIDC access tokens. For example, <code>sub</code>.</p>" + }, + "audiences":{ + "shape":"Audiences", + "documentation":"<p>The access token <code>aud</code> claim values that you want to accept in your policy store. For example, <code>https://myapp.example.com, https://myapp2.example.com</code>.</p>" + } + }, + "documentation":"<p>The configuration of an OpenID Connect (OIDC) identity source for handling access token claims. Contains the claim that you want to identify as the principal in an authorization request, and the values of the <code>aud</code> claim, or audiences, that you want to accept.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_OpenIdConnectTokenSelection.html\">OpenIdConnectTokenSelection</a> structure, which is a parameter of <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_CreateIdentitySource.html\">CreateIdentitySource</a>.</p>" + }, + "OpenIdConnectAccessTokenConfigurationDetail":{ + "type":"structure", + "members":{ + "principalIdClaim":{ + "shape":"Claim", + "documentation":"<p>The claim that determines the principal in OIDC access tokens. For example, <code>sub</code>.</p>" + }, + "audiences":{ + "shape":"Audiences", + "documentation":"<p>The access token <code>aud</code> claim values that you want to accept in your policy store. For example, <code>https://myapp.example.com, https://myapp2.example.com</code>.</p>" + } + }, + "documentation":"<p>The configuration of an OpenID Connect (OIDC) identity source for handling access token claims. Contains the claim that you want to identify as the principal in an authorization request, and the values of the <code>aud</code> claim, or audiences, that you want to accept.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_OpenIdConnectTokenSelectionDetail.html\">OpenIdConnectTokenSelectionDetail</a> structure, which is a parameter of <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_GetIdentitySource.html\">GetIdentitySource</a>.</p>" + }, + "OpenIdConnectAccessTokenConfigurationItem":{ + "type":"structure", + "members":{ + "principalIdClaim":{ + "shape":"Claim", + "documentation":"<p>The claim that determines the principal in OIDC access tokens. For example, <code>sub</code>.</p>" + }, + "audiences":{ + "shape":"Audiences", + "documentation":"<p>The access token <code>aud</code> claim values that you want to accept in your policy store. For example, <code>https://myapp.example.com, https://myapp2.example.com</code>.</p>" + } + }, + "documentation":"<p>The configuration of an OpenID Connect (OIDC) identity source for handling access token claims. Contains the claim that you want to identify as the principal in an authorization request, and the values of the <code>aud</code> claim, or audiences, that you want to accept.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_OpenIdConnectTokenSelectionItem.html\">OpenIdConnectTokenSelectionItem</a> structure, which is a parameter of <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_ListIdentitySources.html\">ListIdentitySources</a>.</p>" + }, + "OpenIdConnectConfiguration":{ + "type":"structure", + "required":[ + "issuer", + "tokenSelection" + ], + "members":{ + "issuer":{ + "shape":"Issuer", + "documentation":"<p>The issuer URL of an OIDC identity provider. This URL must have an OIDC discovery endpoint at the path <code>.well-known/openid-configuration</code>.</p>" + }, + "entityIdPrefix":{ + "shape":"EntityIdPrefix", + "documentation":"<p>A descriptive string that you want to prefix to user entities from your OIDC identity provider. For example, if you set an <code>entityIdPrefix</code> of <code>MyOIDCProvider</code>, you can reference principals in your policies in the format <code>MyCorp::User::MyOIDCProvider|Carlos</code>.</p>" + }, + "groupConfiguration":{ + "shape":"OpenIdConnectGroupConfiguration", + "documentation":"<p>The claim in OIDC identity provider tokens that indicates a user's group membership, and the entity type that you want to map it to. For example, this object can map the contents of a <code>groups</code> claim to <code>MyCorp::UserGroup</code>.</p>" + }, + "tokenSelection":{ + "shape":"OpenIdConnectTokenSelection", + "documentation":"<p>The token type that you want to process from your OIDC identity provider. Your policy store can process either identity (ID) or access tokens from a given OIDC identity source.</p>" + } + }, + "documentation":"<p>Contains configuration details of an OpenID Connect (OIDC) identity provider, or identity source, that Verified Permissions can use to generate entities from authenticated identities. It specifies the issuer URL, token type that you want to use, and policy store entity details.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_Configuration.html\">Configuration</a> structure, which is a parameter to <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_CreateIdentitySource.html\">CreateIdentitySource</a>.</p>" + }, + "OpenIdConnectConfigurationDetail":{ + "type":"structure", + "required":[ + "issuer", + "tokenSelection" + ], + "members":{ + "issuer":{ + "shape":"Issuer", + "documentation":"<p>The issuer URL of an OIDC identity provider. This URL must have an OIDC discovery endpoint at the path <code>.well-known/openid-configuration</code>.</p>" + }, + "entityIdPrefix":{ + "shape":"EntityIdPrefix", + "documentation":"<p>A descriptive string that you want to prefix to user entities from your OIDC identity provider. For example, if you set an <code>entityIdPrefix</code> of <code>MyOIDCProvider</code>, you can reference principals in your policies in the format <code>MyCorp::User::MyOIDCProvider|Carlos</code>.</p>" + }, + "groupConfiguration":{ + "shape":"OpenIdConnectGroupConfigurationDetail", + "documentation":"<p>The claim in OIDC identity provider tokens that indicates a user's group membership, and the entity type that you want to map it to. For example, this object can map the contents of a <code>groups</code> claim to <code>MyCorp::UserGroup</code>.</p>" + }, + "tokenSelection":{ + "shape":"OpenIdConnectTokenSelectionDetail", + "documentation":"<p>The token type that you want to process from your OIDC identity provider. Your policy store can process either identity (ID) or access tokens from a given OIDC identity source.</p>" + } + }, + "documentation":"<p>Contains configuration details of an OpenID Connect (OIDC) identity provider, or identity source, that Verified Permissions can use to generate entities from authenticated identities. It specifies the issuer URL, token type that you want to use, and policy store entity details.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_ConfigurationDetail.html\">ConfigurationDetail</a> structure, which is a parameter to <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_GetIdentitySource.html\">GetIdentitySource</a>.</p>" + }, + "OpenIdConnectConfigurationItem":{ + "type":"structure", + "required":[ + "issuer", + "tokenSelection" + ], + "members":{ + "issuer":{ + "shape":"Issuer", + "documentation":"<p>The issuer URL of an OIDC identity provider. This URL must have an OIDC discovery endpoint at the path <code>.well-known/openid-configuration</code>.</p>" + }, + "entityIdPrefix":{ + "shape":"EntityIdPrefix", + "documentation":"<p>A descriptive string that you want to prefix to user entities from your OIDC identity provider. For example, if you set an <code>entityIdPrefix</code> of <code>MyOIDCProvider</code>, you can reference principals in your policies in the format <code>MyCorp::User::MyOIDCProvider|Carlos</code>.</p>" + }, + "groupConfiguration":{ + "shape":"OpenIdConnectGroupConfigurationItem", + "documentation":"<p>The claim in OIDC identity provider tokens that indicates a user's group membership, and the entity type that you want to map it to. For example, this object can map the contents of a <code>groups</code> claim to <code>MyCorp::UserGroup</code>.</p>" + }, + "tokenSelection":{ + "shape":"OpenIdConnectTokenSelectionItem", + "documentation":"<p>The token type that you want to process from your OIDC identity provider. Your policy store can process either identity (ID) or access tokens from a given OIDC identity source.</p>" + } + }, + "documentation":"<p>Contains configuration details of an OpenID Connect (OIDC) identity provider, or identity source, that Verified Permissions can use to generate entities from authenticated identities. It specifies the issuer URL, token type that you want to use, and policy store entity details.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_ConfigurationDetail.html\">ConfigurationItem</a> structure, which is a parameter to <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_ListIdentitySources.html\">ListIdentitySources</a>.</p>" + }, + "OpenIdConnectGroupConfiguration":{ + "type":"structure", + "required":[ + "groupClaim", + "groupEntityType" + ], + "members":{ + "groupClaim":{ + "shape":"Claim", + "documentation":"<p>The token claim that you want Verified Permissions to interpret as group membership. For example, <code>groups</code>.</p>" + }, + "groupEntityType":{ + "shape":"GroupEntityType", + "documentation":"<p>The policy store entity type that you want to map your users' group claim to. For example, <code>MyCorp::UserGroup</code>. A group entity type is an entity that can have a user entity type as a member.</p>" + } + }, + "documentation":"<p>The claim in OIDC identity provider tokens that indicates a user's group membership, and the entity type that you want to map it to. For example, this object can map the contents of a <code>groups</code> claim to <code>MyCorp::UserGroup</code>.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_OpenIdConnectConfiguration.html\">OpenIdConnectConfiguration</a> structure, which is a parameter of <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_CreateIdentitySource.html\">CreateIdentitySource</a>.</p>" + }, + "OpenIdConnectGroupConfigurationDetail":{ + "type":"structure", + "required":[ + "groupClaim", + "groupEntityType" + ], + "members":{ + "groupClaim":{ + "shape":"Claim", + "documentation":"<p>The token claim that you want Verified Permissions to interpret as group membership. For example, <code>groups</code>.</p>" + }, + "groupEntityType":{ + "shape":"GroupEntityType", + "documentation":"<p>The policy store entity type that you want to map your users' group claim to. For example, <code>MyCorp::UserGroup</code>. A group entity type is an entity that can have a user entity type as a member.</p>" + } + }, + "documentation":"<p>The claim in OIDC identity provider tokens that indicates a user's group membership, and the entity type that you want to map it to. For example, this object can map the contents of a <code>groups</code> claim to <code>MyCorp::UserGroup</code>.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_OpenIdConnectConfigurationDetail.html\">OpenIdConnectConfigurationDetail</a> structure, which is a parameter of <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_GetIdentitySource.html\">GetIdentitySource</a>.</p>" + }, + "OpenIdConnectGroupConfigurationItem":{ + "type":"structure", + "required":[ + "groupClaim", + "groupEntityType" + ], + "members":{ + "groupClaim":{ + "shape":"Claim", + "documentation":"<p>The token claim that you want Verified Permissions to interpret as group membership. For example, <code>groups</code>.</p>" + }, + "groupEntityType":{ + "shape":"GroupEntityType", + "documentation":"<p>The policy store entity type that you want to map your users' group claim to. For example, <code>MyCorp::UserGroup</code>. A group entity type is an entity that can have a user entity type as a member.</p>" + } + }, + "documentation":"<p>The claim in OIDC identity provider tokens that indicates a user's group membership, and the entity type that you want to map it to. For example, this object can map the contents of a <code>groups</code> claim to <code>MyCorp::UserGroup</code>.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_OpenIdConnectConfigurationItem.html\">OpenIdConnectConfigurationItem</a> structure, which is a parameter of <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_ListIdentitySources.html\">ListIdentitySourcea</a>.</p>" + }, + "OpenIdConnectIdentityTokenConfiguration":{ + "type":"structure", + "members":{ + "principalIdClaim":{ + "shape":"Claim", + "documentation":"<p>The claim that determines the principal in OIDC access tokens. For example, <code>sub</code>.</p>" + }, + "clientIds":{ + "shape":"ClientIds", + "documentation":"<p>The ID token audience, or client ID, claim values that you want to accept in your policy store from an OIDC identity provider. For example, <code>1example23456789, 2example10111213</code>.</p>" + } + }, + "documentation":"<p>The configuration of an OpenID Connect (OIDC) identity source for handling identity (ID) token claims. Contains the claim that you want to identify as the principal in an authorization request, and the values of the <code>aud</code> claim, or audiences, that you want to accept.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_OpenIdConnectTokenSelection.html\">OpenIdConnectTokenSelection</a> structure, which is a parameter of <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_CreateIdentitySource.html\">CreateIdentitySource</a>.</p>" + }, + "OpenIdConnectIdentityTokenConfigurationDetail":{ + "type":"structure", + "members":{ + "principalIdClaim":{ + "shape":"Claim", + "documentation":"<p>The claim that determines the principal in OIDC access tokens. For example, <code>sub</code>.</p>" + }, + "clientIds":{ + "shape":"ClientIds", + "documentation":"<p>The ID token audience, or client ID, claim values that you want to accept in your policy store from an OIDC identity provider. For example, <code>1example23456789, 2example10111213</code>.</p>" + } + }, + "documentation":"<p>The configuration of an OpenID Connect (OIDC) identity source for handling identity (ID) token claims. Contains the claim that you want to identify as the principal in an authorization request, and the values of the <code>aud</code> claim, or audiences, that you want to accept.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_OpenIdConnectTokenSelectionDetail.html\">OpenIdConnectTokenSelectionDetail</a> structure, which is a parameter of <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_GetIdentitySource.html\">GetIdentitySource</a>.</p>" + }, + "OpenIdConnectIdentityTokenConfigurationItem":{ + "type":"structure", + "members":{ + "principalIdClaim":{ + "shape":"Claim", + "documentation":"<p>The claim that determines the principal in OIDC access tokens. For example, <code>sub</code>.</p>" + }, + "clientIds":{ + "shape":"ClientIds", + "documentation":"<p>The ID token audience, or client ID, claim values that you want to accept in your policy store from an OIDC identity provider. For example, <code>1example23456789, 2example10111213</code>.</p>" + } + }, + "documentation":"<p>The configuration of an OpenID Connect (OIDC) identity source for handling identity (ID) token claims. Contains the claim that you want to identify as the principal in an authorization request, and the values of the <code>aud</code> claim, or audiences, that you want to accept.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_OpenIdConnectTokenSelectionItem.html\">OpenIdConnectTokenSelectionItem</a> structure, which is a parameter of <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_ListIdentitySources.html\">ListIdentitySources</a>.</p>" + }, + "OpenIdConnectTokenSelection":{ + "type":"structure", + "members":{ + "accessTokenOnly":{ + "shape":"OpenIdConnectAccessTokenConfiguration", + "documentation":"<p>The OIDC configuration for processing access tokens. Contains allowed audience claims, for example <code>https://auth.example.com</code>, and the claim that you want to map to the principal, for example <code>sub</code>.</p>" + }, + "identityTokenOnly":{ + "shape":"OpenIdConnectIdentityTokenConfiguration", + "documentation":"<p>The OIDC configuration for processing identity (ID) tokens. Contains allowed client ID claims, for example <code>1example23456789</code>, and the claim that you want to map to the principal, for example <code>sub</code>.</p>" + } + }, + "documentation":"<p>The token type that you want to process from your OIDC identity provider. Your policy store can process either identity (ID) or access tokens from a given OIDC identity source.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_OpenIdConnectConfiguration.html\">OpenIdConnectConfiguration</a> structure, which is a parameter of <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_CreateIdentitySource.html\">CreateIdentitySource</a>.</p>", + "union":true + }, + "OpenIdConnectTokenSelectionDetail":{ + "type":"structure", + "members":{ + "accessTokenOnly":{ + "shape":"OpenIdConnectAccessTokenConfigurationDetail", + "documentation":"<p>The OIDC configuration for processing access tokens. Contains allowed audience claims, for example <code>https://auth.example.com</code>, and the claim that you want to map to the principal, for example <code>sub</code>.</p>" + }, + "identityTokenOnly":{ + "shape":"OpenIdConnectIdentityTokenConfigurationDetail", + "documentation":"<p>The OIDC configuration for processing identity (ID) tokens. Contains allowed client ID claims, for example <code>1example23456789</code>, and the claim that you want to map to the principal, for example <code>sub</code>.</p>" + } + }, + "documentation":"<p>The token type that you want to process from your OIDC identity provider. Your policy store can process either identity (ID) or access tokens from a given OIDC identity source.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_OpenIdConnectConfigurationDetail.html\">OpenIdConnectConfigurationDetail</a> structure, which is a parameter of <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_GetIdentitySource.html\">GetIdentitySource</a>.</p>", + "union":true + }, + "OpenIdConnectTokenSelectionItem":{ + "type":"structure", + "members":{ + "accessTokenOnly":{ + "shape":"OpenIdConnectAccessTokenConfigurationItem", + "documentation":"<p>The OIDC configuration for processing access tokens. Contains allowed audience claims, for example <code>https://auth.example.com</code>, and the claim that you want to map to the principal, for example <code>sub</code>.</p>" + }, + "identityTokenOnly":{ + "shape":"OpenIdConnectIdentityTokenConfigurationItem", + "documentation":"<p>The OIDC configuration for processing identity (ID) tokens. Contains allowed client ID claims, for example <code>1example23456789</code>, and the claim that you want to map to the principal, for example <code>sub</code>.</p>" + } + }, + "documentation":"<p>The token type that you want to process from your OIDC identity provider. Your policy store can process either identity (ID) or access tokens from a given OIDC identity source.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_OpenIdConnectConfigurationItem.html\">OpenIdConnectConfigurationItem</a> structure, which is a parameter of <a href=\"http://amazonaws.com/verifiedpermissions/latest/apireference/API_ListIdentitySources.html\">ListIdentitySources</a>.</p>", + "union":true + }, "OpenIdIssuer":{ "type":"string", "enum":["COGNITO"] }, "ParentList":{ "type":"list", - "member":{"shape":"EntityIdentifier"}, - "max":100, - "min":0 + "member":{"shape":"EntityIdentifier"} }, "PolicyDefinition":{ "type":"structure", @@ -2674,9 +2968,13 @@ "cognitoUserPoolConfiguration":{ "shape":"UpdateCognitoUserPoolConfiguration", "documentation":"<p>Contains configuration details of a Amazon Cognito user pool.</p>" + }, + "openIdConnectConfiguration":{ + "shape":"UpdateOpenIdConnectConfiguration", + "documentation":"<p>Contains configuration details of an OpenID Connect (OIDC) identity provider, or identity source, that Verified Permissions can use to generate entities from authenticated identities. It specifies the issuer URL, token type that you want to use, and policy store entity details.</p>" } }, - "documentation":"<p>Contains an updated configuration to replace the configuration in an existing identity source.</p> <note> <p>At this time, the only valid member of this structure is a Amazon Cognito user pool configuration.</p> <p>You must specify a <code>userPoolArn</code>, and optionally, a <code>ClientId</code>.</p> </note>", + "documentation":"<p>Contains an update to replace the configuration in an existing identity source.</p>", "union":true }, "UpdateIdentitySourceInput":{ @@ -2732,6 +3030,93 @@ } } }, + "UpdateOpenIdConnectAccessTokenConfiguration":{ + "type":"structure", + "members":{ + "principalIdClaim":{ + "shape":"Claim", + "documentation":"<p>The claim that determines the principal in OIDC access tokens. For example, <code>sub</code>.</p>" + }, + "audiences":{ + "shape":"Audiences", + "documentation":"<p>The access token <code>aud</code> claim values that you want to accept in your policy store. For example, <code>https://myapp.example.com, https://myapp2.example.com</code>.</p>" + } + }, + "documentation":"<p>The configuration of an OpenID Connect (OIDC) identity source for handling access token claims. Contains the claim that you want to identify as the principal in an authorization request, and the values of the <code>aud</code> claim, or audiences, that you want to accept.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_UpdateOpenIdConnectTokenSelection.html\">UpdateOpenIdConnectTokenSelection</a> structure, which is a parameter to <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_UpdateIdentitySource.html\">UpdateIdentitySource</a>.</p>" + }, + "UpdateOpenIdConnectConfiguration":{ + "type":"structure", + "required":[ + "issuer", + "tokenSelection" + ], + "members":{ + "issuer":{ + "shape":"Issuer", + "documentation":"<p>The issuer URL of an OIDC identity provider. This URL must have an OIDC discovery endpoint at the path <code>.well-known/openid-configuration</code>.</p>" + }, + "entityIdPrefix":{ + "shape":"EntityIdPrefix", + "documentation":"<p>A descriptive string that you want to prefix to user entities from your OIDC identity provider. For example, if you set an <code>entityIdPrefix</code> of <code>MyOIDCProvider</code>, you can reference principals in your policies in the format <code>MyCorp::User::MyOIDCProvider|Carlos</code>.</p>" + }, + "groupConfiguration":{ + "shape":"UpdateOpenIdConnectGroupConfiguration", + "documentation":"<p>The claim in OIDC identity provider tokens that indicates a user's group membership, and the entity type that you want to map it to. For example, this object can map the contents of a <code>groups</code> claim to <code>MyCorp::UserGroup</code>.</p>" + }, + "tokenSelection":{ + "shape":"UpdateOpenIdConnectTokenSelection", + "documentation":"<p>The token type that you want to process from your OIDC identity provider. Your policy store can process either identity (ID) or access tokens from a given OIDC identity source.</p>" + } + }, + "documentation":"<p>Contains configuration details of an OpenID Connect (OIDC) identity provider, or identity source, that Verified Permissions can use to generate entities from authenticated identities. It specifies the issuer URL, token type that you want to use, and policy store entity details.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_UpdateConfiguration.html\">UpdateConfiguration</a> structure, which is a parameter to <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_UpdateIdentitySource.html\">UpdateIdentitySource</a>.</p>" + }, + "UpdateOpenIdConnectGroupConfiguration":{ + "type":"structure", + "required":[ + "groupClaim", + "groupEntityType" + ], + "members":{ + "groupClaim":{ + "shape":"Claim", + "documentation":"<p>The token claim that you want Verified Permissions to interpret as group membership. For example, <code>groups</code>.</p>" + }, + "groupEntityType":{ + "shape":"GroupEntityType", + "documentation":"<p>The policy store entity type that you want to map your users' group claim to. For example, <code>MyCorp::UserGroup</code>. A group entity type is an entity that can have a user entity type as a member.</p>" + } + }, + "documentation":"<p>The claim in OIDC identity provider tokens that indicates a user's group membership, and the entity type that you want to map it to. For example, this object can map the contents of a <code>groups</code> claim to <code>MyCorp::UserGroup</code>.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_UpdateOpenIdConnectConfiguration.html\">UpdateOpenIdConnectConfiguration</a> structure, which is a parameter to <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_UpdateIdentitySource.html\">UpdateIdentitySource</a>.</p>" + }, + "UpdateOpenIdConnectIdentityTokenConfiguration":{ + "type":"structure", + "members":{ + "principalIdClaim":{ + "shape":"Claim", + "documentation":"<p>The claim that determines the principal in OIDC access tokens. For example, <code>sub</code>.</p>" + }, + "clientIds":{ + "shape":"ClientIds", + "documentation":"<p>The ID token audience, or client ID, claim values that you want to accept in your policy store from an OIDC identity provider. For example, <code>1example23456789, 2example10111213</code>.</p>" + } + }, + "documentation":"<p>The configuration of an OpenID Connect (OIDC) identity source for handling identity (ID) token claims. Contains the claim that you want to identify as the principal in an authorization request, and the values of the <code>aud</code> claim, or audiences, that you want to accept.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_UpdateOpenIdConnectTokenSelection.html\">UpdateOpenIdConnectTokenSelection</a> structure, which is a parameter to <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_UpdateIdentitySource.html\">UpdateIdentitySource</a>.</p>" + }, + "UpdateOpenIdConnectTokenSelection":{ + "type":"structure", + "members":{ + "accessTokenOnly":{ + "shape":"UpdateOpenIdConnectAccessTokenConfiguration", + "documentation":"<p>The OIDC configuration for processing access tokens. Contains allowed audience claims, for example <code>https://auth.example.com</code>, and the claim that you want to map to the principal, for example <code>sub</code>.</p>" + }, + "identityTokenOnly":{ + "shape":"UpdateOpenIdConnectIdentityTokenConfiguration", + "documentation":"<p>The OIDC configuration for processing identity (ID) tokens. Contains allowed client ID claims, for example <code>1example23456789</code>, and the claim that you want to map to the principal, for example <code>sub</code>.</p>" + } + }, + "documentation":"<p>The token type that you want to process from your OIDC identity provider. Your policy store can process either identity (ID) or access tokens from a given OIDC identity source.</p> <p>This data type is part of a <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_UpdateOpenIdConnectConfiguration.html\">UpdateOpenIdConnectConfiguration</a> structure, which is a parameter to <a href=\"https://docs.aws.amazon.com/verifiedpermissions/latest/apireference/API_UpdateIdentitySource.html\">UpdateIdentitySource</a>.</p>", + "union":true + }, "UpdatePolicyDefinition":{ "type":"structure", "members":{ diff --git a/services/voiceid/pom.xml b/services/voiceid/pom.xml index 3470c1bb621a..76d736999882 100644 --- a/services/voiceid/pom.xml +++ b/services/voiceid/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>voiceid</artifactId> <name>AWS Java SDK :: Services :: Voice ID</name> diff --git a/services/vpclattice/pom.xml b/services/vpclattice/pom.xml index 38531affd819..41c4c1e478b8 100644 --- a/services/vpclattice/pom.xml +++ b/services/vpclattice/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>vpclattice</artifactId> <name>AWS Java SDK :: Services :: VPC Lattice</name> diff --git a/services/waf/pom.xml b/services/waf/pom.xml index f9c6186fcc02..e3b98190f205 100644 --- a/services/waf/pom.xml +++ b/services/waf/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>waf</artifactId> <name>AWS Java SDK :: Services :: AWS WAF</name> diff --git a/services/wafv2/pom.xml b/services/wafv2/pom.xml index 8009c5832d0a..429543b4cbfc 100644 --- a/services/wafv2/pom.xml +++ b/services/wafv2/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>wafv2</artifactId> <name>AWS Java SDK :: Services :: WAFV2</name> diff --git a/services/wellarchitected/pom.xml b/services/wellarchitected/pom.xml index 3e93725a8587..5ddcfb891a28 100644 --- a/services/wellarchitected/pom.xml +++ b/services/wellarchitected/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>wellarchitected</artifactId> <name>AWS Java SDK :: Services :: Well Architected</name> diff --git a/services/wisdom/pom.xml b/services/wisdom/pom.xml index 3929d6008077..fc2af5eb56d3 100644 --- a/services/wisdom/pom.xml +++ b/services/wisdom/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>wisdom</artifactId> <name>AWS Java SDK :: Services :: Wisdom</name> diff --git a/services/workdocs/pom.xml b/services/workdocs/pom.xml index 15b6629fbbca..647de3f5bed6 100644 --- a/services/workdocs/pom.xml +++ b/services/workdocs/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>workdocs</artifactId> <name>AWS Java SDK :: Services :: Amazon WorkDocs</name> diff --git a/services/worklink/pom.xml b/services/worklink/pom.xml index ce2a74c38bfe..2d512784c1cb 100644 --- a/services/worklink/pom.xml +++ b/services/worklink/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>worklink</artifactId> <name>AWS Java SDK :: Services :: WorkLink</name> diff --git a/services/workmail/pom.xml b/services/workmail/pom.xml index eac8922583d8..3285b1cb1a56 100644 --- a/services/workmail/pom.xml +++ b/services/workmail/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>services</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>workmail</artifactId> diff --git a/services/workmailmessageflow/pom.xml b/services/workmailmessageflow/pom.xml index 8141ce202145..e8ba66695a5e 100644 --- a/services/workmailmessageflow/pom.xml +++ b/services/workmailmessageflow/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>workmailmessageflow</artifactId> <name>AWS Java SDK :: Services :: WorkMailMessageFlow</name> diff --git a/services/workspaces/pom.xml b/services/workspaces/pom.xml index f713ed1d5715..90572d15eebd 100644 --- a/services/workspaces/pom.xml +++ b/services/workspaces/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>workspaces</artifactId> <name>AWS Java SDK :: Services :: Amazon WorkSpaces</name> diff --git a/services/workspacesthinclient/pom.xml b/services/workspacesthinclient/pom.xml index 8d23fd58067e..7eb5a0580555 100644 --- a/services/workspacesthinclient/pom.xml +++ b/services/workspacesthinclient/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>workspacesthinclient</artifactId> <name>AWS Java SDK :: Services :: Work Spaces Thin Client</name> diff --git a/services/workspacesweb/pom.xml b/services/workspacesweb/pom.xml index edcfbe07b5bf..633576524efd 100644 --- a/services/workspacesweb/pom.xml +++ b/services/workspacesweb/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>workspacesweb</artifactId> <name>AWS Java SDK :: Services :: Work Spaces Web</name> diff --git a/services/xray/pom.xml b/services/xray/pom.xml index fafd01680e8f..28b0557bda78 100644 --- a/services/xray/pom.xml +++ b/services/xray/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>services</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>xray</artifactId> <name>AWS Java SDK :: Services :: AWS X-Ray</name> diff --git a/test/auth-tests/pom.xml b/test/auth-tests/pom.xml index 338fb35e6591..733bbf0062c9 100644 --- a/test/auth-tests/pom.xml +++ b/test/auth-tests/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/test/bundle-logging-bridge-binding-test/pom.xml b/test/bundle-logging-bridge-binding-test/pom.xml index 2dda7ce39cd7..f2720a2f86c4 100644 --- a/test/bundle-logging-bridge-binding-test/pom.xml +++ b/test/bundle-logging-bridge-binding-test/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/test/bundle-shading-tests/pom.xml b/test/bundle-shading-tests/pom.xml index 45c292c8ed55..69393b003927 100644 --- a/test/bundle-shading-tests/pom.xml +++ b/test/bundle-shading-tests/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/test/codegen-generated-classes-test/pom.xml b/test/codegen-generated-classes-test/pom.xml index b8fc82d622cd..9e54fedffaab 100644 --- a/test/codegen-generated-classes-test/pom.xml +++ b/test/codegen-generated-classes-test/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/test/crt-unavailable-tests/pom.xml b/test/crt-unavailable-tests/pom.xml index 33a6da838646..890fb0fbe891 100644 --- a/test/crt-unavailable-tests/pom.xml +++ b/test/crt-unavailable-tests/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/test/http-client-tests/pom.xml b/test/http-client-tests/pom.xml index cd5fb40a189c..ff7d065e6352 100644 --- a/test/http-client-tests/pom.xml +++ b/test/http-client-tests/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>http-client-tests</artifactId> diff --git a/test/module-path-tests/pom.xml b/test/module-path-tests/pom.xml index ef4a35bd149b..75c5761a190a 100644 --- a/test/module-path-tests/pom.xml +++ b/test/module-path-tests/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/test/old-client-version-compatibility-test/pom.xml b/test/old-client-version-compatibility-test/pom.xml index 4c35920ad65a..08cd79e72fc5 100644 --- a/test/old-client-version-compatibility-test/pom.xml +++ b/test/old-client-version-compatibility-test/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/test/protocol-tests-core/pom.xml b/test/protocol-tests-core/pom.xml index 1119c176c590..68284c7d4667 100644 --- a/test/protocol-tests-core/pom.xml +++ b/test/protocol-tests-core/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/test/protocol-tests/pom.xml b/test/protocol-tests/pom.xml index 2398ada8c599..decd4a401175 100644 --- a/test/protocol-tests/pom.xml +++ b/test/protocol-tests/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/test/region-testing/pom.xml b/test/region-testing/pom.xml index d663819efb2b..07e004209e5f 100644 --- a/test/region-testing/pom.xml +++ b/test/region-testing/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/test/ruleset-testing-core/pom.xml b/test/ruleset-testing-core/pom.xml index ba054258973d..bd284f6dd2bd 100644 --- a/test/ruleset-testing-core/pom.xml +++ b/test/ruleset-testing-core/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/test/s3-benchmarks/pom.xml b/test/s3-benchmarks/pom.xml index 9bd9eb84a3d8..941ebd705580 100644 --- a/test/s3-benchmarks/pom.xml +++ b/test/s3-benchmarks/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/test/sdk-benchmarks/pom.xml b/test/sdk-benchmarks/pom.xml index 36c2a678e6ca..1ffc9066e4ce 100644 --- a/test/sdk-benchmarks/pom.xml +++ b/test/sdk-benchmarks/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> diff --git a/test/sdk-native-image-test/pom.xml b/test/sdk-native-image-test/pom.xml index 7322f9974912..14d05348a156 100644 --- a/test/sdk-native-image-test/pom.xml +++ b/test/sdk-native-image-test/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/test/service-test-utils/pom.xml b/test/service-test-utils/pom.xml index 63834a7ce5be..52cc5f60bc66 100644 --- a/test/service-test-utils/pom.xml +++ b/test/service-test-utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>service-test-utils</artifactId> diff --git a/test/stability-tests/pom.xml b/test/stability-tests/pom.xml index 6bbc4f15f59c..e9a7bcd28eb4 100644 --- a/test/stability-tests/pom.xml +++ b/test/stability-tests/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/test/test-utils/pom.xml b/test/test-utils/pom.xml index e19433f2b6f7..ee52405d8ed4 100644 --- a/test/test-utils/pom.xml +++ b/test/test-utils/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>software.amazon.awssdk</groupId> <artifactId>aws-sdk-java-pom</artifactId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <artifactId>test-utils</artifactId> diff --git a/test/tests-coverage-reporting/pom.xml b/test/tests-coverage-reporting/pom.xml index 43e4981d70b1..746ba64c969b 100644 --- a/test/tests-coverage-reporting/pom.xml +++ b/test/tests-coverage-reporting/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/third-party/pom.xml b/third-party/pom.xml index 83a9b39603d4..f203974a4d60 100644 --- a/third-party/pom.xml +++ b/third-party/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <artifactId>third-party</artifactId> diff --git a/third-party/third-party-jackson-core/pom.xml b/third-party/third-party-jackson-core/pom.xml index 984090ff489d..7d7f044f4a8f 100644 --- a/third-party/third-party-jackson-core/pom.xml +++ b/third-party/third-party-jackson-core/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>third-party</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/third-party/third-party-jackson-dataformat-cbor/pom.xml b/third-party/third-party-jackson-dataformat-cbor/pom.xml index e4b13c34efe0..0de53c87b6d6 100644 --- a/third-party/third-party-jackson-dataformat-cbor/pom.xml +++ b/third-party/third-party-jackson-dataformat-cbor/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>third-party</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/third-party/third-party-slf4j-api/pom.xml b/third-party/third-party-slf4j-api/pom.xml index cef9cbafd970..00d707d99e88 100644 --- a/third-party/third-party-slf4j-api/pom.xml +++ b/third-party/third-party-slf4j-api/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>third-party</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/utils/pom.xml b/utils/pom.xml index a3c50fbb3afd..ce5451fcfa21 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -20,7 +20,7 @@ <parent> <artifactId>aws-sdk-java-pom</artifactId> <groupId>software.amazon.awssdk</groupId> - <version>2.25.67-SNAPSHOT</version> + <version>2.25.70-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/utils/src/main/java/software/amazon/awssdk/utils/StringInputStream.java b/utils/src/main/java/software/amazon/awssdk/utils/StringInputStream.java index f0d595c681e3..36da50fbce5d 100644 --- a/utils/src/main/java/software/amazon/awssdk/utils/StringInputStream.java +++ b/utils/src/main/java/software/amazon/awssdk/utils/StringInputStream.java @@ -16,6 +16,7 @@ package software.amazon.awssdk.utils; import java.io.ByteArrayInputStream; +import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import software.amazon.awssdk.annotations.SdkProtectedApi; @@ -29,7 +30,11 @@ public class StringInputStream extends ByteArrayInputStream { private final String string; public StringInputStream(String s) { - super(s.getBytes(StandardCharsets.UTF_8)); + this(s, StandardCharsets.UTF_8); + } + + public StringInputStream(String s, Charset charset) { + super(s.getBytes(charset)); this.string = s; }