From 00c5fc72f87f4eebe2fc25400d9283ca2bceb0ea Mon Sep 17 00:00:00 2001 From: aws-sdk-go-automation <43143561+aws-sdk-go-automation@users.noreply.github.com> Date: Fri, 11 Nov 2022 12:13:39 -0800 Subject: [PATCH] Release v1.44.136 (2022-11-11) (#4620) Release v1.44.136 (2022-11-11) === ### Service Client Updates * `service/glue`: Updates service documentation * Added links related to enabling job bookmarks. * `service/iot`: Updates service API and documentation * This release add new api listRelatedResourcesForAuditFinding and new member type IssuerCertificates for Iot device device defender Audit. * `service/license-manager`: Updates service API and documentation * `service/marketplace-catalog`: Updates service API and documentation * `service/rekognition`: Updates service API and documentation * Adding support for ImageProperties feature to detect dominant colors and image brightness, sharpness, and contrast, inclusion and exclusion filters for labels and label categories, new fields to the API response, "aliases" and "categories" * `service/securityhub`: Updates service documentation * `service/ssm-incidents`: Updates service API and documentation --- CHANGELOG.md | 15 + aws/endpoints/defaults.go | 40 +- aws/version.go | 2 +- models/apis/glue/2017-03-31/docs-2.json | 10 +- .../glue/2017-03-31/endpoint-tests-1.json | 492 +++--- models/apis/iot/2015-05-28/api-2.json | 73 +- models/apis/iot/2015-05-28/docs-2.json | 47 +- .../apis/iot/2015-05-28/endpoint-tests-1.json | 406 ++--- .../license-manager/2018-08-01/api-2.json | 68 + .../license-manager/2018-08-01/docs-2.json | 41 +- .../2018-08-01/endpoint-rule-set-1.json | 315 ++++ .../2018-08-01/endpoint-tests-1.json | 1491 +++++++++++++++++ .../marketplace-catalog/2018-09-17/api-2.json | 143 +- .../2018-09-17/docs-2.json | 78 +- .../2018-09-17/endpoint-rule-set-1.json | 315 ++++ .../2018-09-17/endpoint-tests-1.json | 147 ++ models/apis/rekognition/2016-06-27/api-2.json | 133 +- .../apis/rekognition/2016-06-27/docs-2.json | 152 +- .../2016-06-27/endpoint-rule-set-1.json | 429 +++++ .../2016-06-27/endpoint-tests-1.json | 771 +++++++++ .../apis/securityhub/2018-10-26/docs-2.json | 8 +- .../2018-10-26/endpoint-rule-set-1.json | 315 ++++ .../2018-10-26/endpoint-tests-1.json | 1395 +++++++++++++++ .../apis/ssm-incidents/2018-05-10/api-2.json | 27 +- .../apis/ssm-incidents/2018-05-10/docs-2.json | 23 + .../2018-05-10/endpoint-tests-1.json | 262 +-- models/endpoints/endpoints.json | 16 +- service/glue/api.go | 22 +- service/iot/api.go | 298 +++- service/iot/iotiface/interface.go | 4 + service/licensemanager/api.go | 432 ++++- .../licensemanageriface/interface.go | 8 + service/marketplacecatalog/api.go | 689 +++++++- .../marketplacecatalogiface/interface.go | 12 + service/rekognition/api.go | 707 +++++++- service/securityhub/api.go | 14 +- service/ssmincidents/api.go | 108 ++ 37 files changed, 8820 insertions(+), 688 deletions(-) create mode 100644 models/apis/license-manager/2018-08-01/endpoint-rule-set-1.json create mode 100644 models/apis/license-manager/2018-08-01/endpoint-tests-1.json create mode 100644 models/apis/marketplace-catalog/2018-09-17/endpoint-rule-set-1.json create mode 100644 models/apis/marketplace-catalog/2018-09-17/endpoint-tests-1.json create mode 100644 models/apis/rekognition/2016-06-27/endpoint-rule-set-1.json create mode 100644 models/apis/rekognition/2016-06-27/endpoint-tests-1.json create mode 100644 models/apis/securityhub/2018-10-26/endpoint-rule-set-1.json create mode 100644 models/apis/securityhub/2018-10-26/endpoint-tests-1.json diff --git a/CHANGELOG.md b/CHANGELOG.md index f42c2b66e2e..29878472442 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +Release v1.44.136 (2022-11-11) +=== + +### Service Client Updates +* `service/glue`: Updates service documentation + * Added links related to enabling job bookmarks. +* `service/iot`: Updates service API and documentation + * This release add new api listRelatedResourcesForAuditFinding and new member type IssuerCertificates for Iot device device defender Audit. +* `service/license-manager`: Updates service API and documentation +* `service/marketplace-catalog`: Updates service API and documentation +* `service/rekognition`: Updates service API and documentation + * Adding support for ImageProperties feature to detect dominant colors and image brightness, sharpness, and contrast, inclusion and exclusion filters for labels and label categories, new fields to the API response, "aliases" and "categories" +* `service/securityhub`: Updates service documentation +* `service/ssm-incidents`: Updates service API and documentation + Release v1.44.135 (2022-11-10) === diff --git a/aws/endpoints/defaults.go b/aws/endpoints/defaults.go index bce57275d5b..186a466ae5a 100644 --- a/aws/endpoints/defaults.go +++ b/aws/endpoints/defaults.go @@ -9740,6 +9740,9 @@ var awsPartition = partition{ endpointKey{ Region: "ap-southeast-2", }: endpoint{}, + endpointKey{ + Region: "ap-southeast-3", + }: endpoint{}, endpointKey{ Region: "ca-central-1", }: endpoint{}, @@ -11466,6 +11469,9 @@ var awsPartition = partition{ }, "gamesparks": service{ Endpoints: serviceEndpoints{ + endpointKey{ + Region: "ap-northeast-1", + }: endpoint{}, endpointKey{ Region: "us-east-1", }: endpoint{}, @@ -16892,9 +16898,6 @@ var awsPartition = partition{ endpointKey{ Region: "ap-southeast-2", }: endpoint{}, - endpointKey{ - Region: "ap-southeast-3", - }: endpoint{}, endpointKey{ Region: "ca-central-1", }: endpoint{}, @@ -21260,6 +21263,37 @@ var awsPartition = partition{ }, }, }, + "scheduler": service{ + Endpoints: serviceEndpoints{ + endpointKey{ + Region: "ap-northeast-1", + }: endpoint{}, + endpointKey{ + Region: "ap-southeast-1", + }: endpoint{}, + endpointKey{ + Region: "ap-southeast-2", + }: endpoint{}, + endpointKey{ + Region: "eu-central-1", + }: endpoint{}, + endpointKey{ + Region: "eu-north-1", + }: endpoint{}, + endpointKey{ + Region: "eu-west-1", + }: endpoint{}, + endpointKey{ + Region: "us-east-1", + }: endpoint{}, + endpointKey{ + Region: "us-east-2", + }: endpoint{}, + endpointKey{ + Region: "us-west-2", + }: endpoint{}, + }, + }, "schemas": service{ Endpoints: serviceEndpoints{ endpointKey{ diff --git a/aws/version.go b/aws/version.go index 0e8c358e413..b01bc446c57 100644 --- a/aws/version.go +++ b/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go" // SDKVersion is the version of this SDK -const SDKVersion = "1.44.135" +const SDKVersion = "1.44.136" diff --git a/models/apis/glue/2017-03-31/docs-2.json b/models/apis/glue/2017-03-31/docs-2.json index b38a242338b..c0bcd659fc4 100644 --- a/models/apis/glue/2017-03-31/docs-2.json +++ b/models/apis/glue/2017-03-31/docs-2.json @@ -83,9 +83,9 @@ "GetDatabases": "

Retrieves all databases defined in a given Data Catalog.

", "GetDataflowGraph": "

Transforms a Python script into a directed acyclic graph (DAG).

", "GetDevEndpoint": "

Retrieves information about a specified development endpoint.

When you create a development endpoint in a virtual private cloud (VPC), Glue returns only a private IP address, and the public IP address field is not populated. When you create a non-VPC development endpoint, Glue returns only a public IP address.

", - "GetDevEndpoints": "

Retrieves all the development endpoints in this AWS account.

When you create a development endpoint in a virtual private cloud (VPC), Glue returns only a private IP address and the public IP address field is not populated. When you create a non-VPC development endpoint, Glue returns only a public IP address.

", + "GetDevEndpoints": "

Retrieves all the development endpoints in this Amazon Web Services account.

When you create a development endpoint in a virtual private cloud (VPC), Glue returns only a private IP address and the public IP address field is not populated. When you create a non-VPC development endpoint, Glue returns only a public IP address.

", "GetJob": "

Retrieves an existing job definition.

", - "GetJobBookmark": "

Returns information on a job bookmark entry.

", + "GetJobBookmark": "

Returns information on a job bookmark entry.

For more information about enabling and using job bookmarks, see:

", "GetJobRun": "

Retrieves the metadata for a given job run.

", "GetJobRuns": "

Retrieves metadata for all runs of a given job definition.

", "GetJobs": "

Retrieves all current job definitions.

", @@ -147,7 +147,7 @@ "QuerySchemaVersionMetadata": "

Queries for the schema version metadata information.

", "RegisterSchemaVersion": "

Adds a new version to the existing schema. Returns an error if new version of schema does not meet the compatibility requirements of the schema set. This API will not create a new schema set and will return a 404 error if the schema set is not already present in the Schema Registry.

If this is the first schema definition to be registered in the Schema Registry, this API will store the schema version and return immediately. Otherwise, this call has the potential to run longer than other operations due to compatibility modes. You can call the GetSchemaVersion API with the SchemaVersionId to check compatibility modes.

If the same schema definition is already stored in Schema Registry as a version, the schema ID of the existing schema is returned to the caller.

", "RemoveSchemaVersionMetadata": "

Removes a key value pair from the schema version metadata for the specified schema version ID.

", - "ResetJobBookmark": "

Resets a bookmark entry.

", + "ResetJobBookmark": "

Resets a bookmark entry.

For more information about enabling and using job bookmarks, see:

", "ResumeWorkflowRun": "

Restarts selected nodes of a previous partially completed workflow run and resumes the workflow run. The selected nodes and all nodes that are downstream from the selected nodes are run.

", "RunStatement": "

Executes the statement.

", "SearchTables": "

Searches a set of tables based on properties in the table metadata as well as on the parent database. You can search against text or filter conditions.

You can only get tables that you have access to based on the security policies defined in Lake Formation. You need at least a read-only access to the table for it to be returned. If you do not have access to all the columns in the table, these columns will not be searched against when returning the list of tables back to you. If you have access to the columns but not the data in the columns, those columns and the associated metadata for those columns will be included in the search.

", @@ -2808,7 +2808,7 @@ "CreateDevEndpointResponse$Status": "

The current status of the new DevEndpoint.

", "CreateDevEndpointResponse$SubnetId": "

The subnet ID assigned to the new DevEndpoint.

", "CreateDevEndpointResponse$YarnEndpointAddress": "

The address of the YARN endpoint used by this DevEndpoint.

", - "CreateDevEndpointResponse$AvailabilityZone": "

The AWS Availability Zone where this DevEndpoint is located.

", + "CreateDevEndpointResponse$AvailabilityZone": "

The Amazon Web Services Availability Zone where this DevEndpoint is located.

", "CreateDevEndpointResponse$VpcId": "

The ID of the virtual private cloud (VPC) used by this DevEndpoint.

", "CreateDevEndpointResponse$ExtraPythonLibsS3Path": "

The paths to one or more Python libraries in an S3 bucket that will be loaded in your DevEndpoint.

", "CreateDevEndpointResponse$ExtraJarsS3Path": "

Path to one or more Java .jar files in an S3 bucket that will be loaded in your DevEndpoint.

", @@ -2822,7 +2822,7 @@ "DevEndpoint$PrivateAddress": "

A private IP address to access the DevEndpoint within a VPC if the DevEndpoint is created within one. The PrivateAddress field is present only when you create the DevEndpoint within your VPC.

", "DevEndpoint$PublicAddress": "

The public IP address used by this DevEndpoint. The PublicAddress field is present only when you create a non-virtual private cloud (VPC) DevEndpoint.

", "DevEndpoint$Status": "

The current status of this DevEndpoint.

", - "DevEndpoint$AvailabilityZone": "

The AWS Availability Zone where this DevEndpoint is located.

", + "DevEndpoint$AvailabilityZone": "

The Amazon Web Services Availability Zone where this DevEndpoint is located.

", "DevEndpoint$VpcId": "

The ID of the virtual private cloud (VPC) used by this DevEndpoint.

", "DevEndpoint$ExtraPythonLibsS3Path": "

The paths to one or more Python libraries in an Amazon S3 bucket that should be loaded in your DevEndpoint. Multiple values must be complete paths separated by a comma.

You can only use pure Python libraries with a DevEndpoint. Libraries that rely on C extensions, such as the pandas Python data analysis library, are not currently supported.

", "DevEndpoint$ExtraJarsS3Path": "

The path to one or more Java .jar files in an S3 bucket that should be loaded in your DevEndpoint.

You can only use pure Java/Scala libraries with a DevEndpoint.

", diff --git a/models/apis/glue/2017-03-31/endpoint-tests-1.json b/models/apis/glue/2017-03-31/endpoint-tests-1.json index f4d72c68822..7037dbd5ec3 100644 --- a/models/apis/glue/2017-03-31/endpoint-tests-1.json +++ b/models/apis/glue/2017-03-31/endpoint-tests-1.json @@ -8,9 +8,9 @@ } }, "params": { - "Region": "ap-south-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-south-1" } }, { @@ -21,9 +21,9 @@ } }, "params": { - "Region": "ap-south-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-south-1" } }, { @@ -34,9 +34,9 @@ } }, "params": { - "Region": "ap-south-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-south-1" } }, { @@ -47,9 +47,9 @@ } }, "params": { - "Region": "ap-south-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-south-1" } }, { @@ -60,9 +60,9 @@ } }, "params": { - "Region": "eu-south-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "eu-south-1" } }, { @@ -73,9 +73,9 @@ } }, "params": { - "Region": "eu-south-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "eu-south-1" } }, { @@ -86,9 +86,9 @@ } }, "params": { - "Region": "eu-south-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "eu-south-1" } }, { @@ -99,9 +99,9 @@ } }, "params": { - "Region": "eu-south-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "eu-south-1" } }, { @@ -112,9 +112,9 @@ } }, "params": { - "Region": "eu-south-2", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "eu-south-2" } }, { @@ -125,9 +125,9 @@ } }, "params": { - "Region": "eu-south-2", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "eu-south-2" } }, { @@ -138,9 +138,9 @@ } }, "params": { - "Region": "eu-south-2", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "eu-south-2" } }, { @@ -151,9 +151,9 @@ } }, "params": { - "Region": "eu-south-2", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "eu-south-2" } }, { @@ -164,9 +164,9 @@ } }, "params": { - "Region": "us-gov-east-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-gov-east-1" } }, { @@ -177,9 +177,9 @@ } }, "params": { - "Region": "us-gov-east-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-gov-east-1" } }, { @@ -190,9 +190,9 @@ } }, "params": { - "Region": "us-gov-east-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-gov-east-1" } }, { @@ -203,9 +203,9 @@ } }, "params": { - "Region": "us-gov-east-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-gov-east-1" } }, { @@ -216,9 +216,9 @@ } }, "params": { - "Region": "me-central-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "me-central-1" } }, { @@ -229,9 +229,9 @@ } }, "params": { - "Region": "me-central-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "me-central-1" } }, { @@ -242,9 +242,9 @@ } }, "params": { - "Region": "me-central-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "me-central-1" } }, { @@ -255,9 +255,9 @@ } }, "params": { - "Region": "me-central-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "me-central-1" } }, { @@ -268,9 +268,9 @@ } }, "params": { - "Region": "ca-central-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ca-central-1" } }, { @@ -281,9 +281,9 @@ } }, "params": { - "Region": "ca-central-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ca-central-1" } }, { @@ -294,9 +294,9 @@ } }, "params": { - "Region": "ca-central-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ca-central-1" } }, { @@ -307,9 +307,9 @@ } }, "params": { - "Region": "ca-central-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ca-central-1" } }, { @@ -320,9 +320,9 @@ } }, "params": { - "Region": "eu-central-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "eu-central-1" } }, { @@ -333,9 +333,9 @@ } }, "params": { - "Region": "eu-central-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "eu-central-1" } }, { @@ -346,9 +346,9 @@ } }, "params": { - "Region": "eu-central-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "eu-central-1" } }, { @@ -359,9 +359,9 @@ } }, "params": { - "Region": "eu-central-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "eu-central-1" } }, { @@ -372,9 +372,9 @@ } }, "params": { - "Region": "us-west-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-west-1" } }, { @@ -385,9 +385,9 @@ } }, "params": { - "Region": "us-west-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-west-1" } }, { @@ -398,9 +398,9 @@ } }, "params": { - "Region": "us-west-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-west-1" } }, { @@ -411,9 +411,9 @@ } }, "params": { - "Region": "us-west-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-west-1" } }, { @@ -424,9 +424,9 @@ } }, "params": { - "Region": "us-west-2", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-west-2" } }, { @@ -437,9 +437,9 @@ } }, "params": { - "Region": "us-west-2", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-west-2" } }, { @@ -450,9 +450,9 @@ } }, "params": { - "Region": "us-west-2", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-west-2" } }, { @@ -463,9 +463,9 @@ } }, "params": { - "Region": "us-west-2", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-west-2" } }, { @@ -476,9 +476,9 @@ } }, "params": { - "Region": "af-south-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "af-south-1" } }, { @@ -489,9 +489,9 @@ } }, "params": { - "Region": "af-south-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "af-south-1" } }, { @@ -502,9 +502,9 @@ } }, "params": { - "Region": "af-south-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "af-south-1" } }, { @@ -515,9 +515,9 @@ } }, "params": { - "Region": "af-south-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "af-south-1" } }, { @@ -528,9 +528,9 @@ } }, "params": { - "Region": "eu-north-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "eu-north-1" } }, { @@ -541,9 +541,9 @@ } }, "params": { - "Region": "eu-north-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "eu-north-1" } }, { @@ -554,9 +554,9 @@ } }, "params": { - "Region": "eu-north-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "eu-north-1" } }, { @@ -567,9 +567,9 @@ } }, "params": { - "Region": "eu-north-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "eu-north-1" } }, { @@ -580,9 +580,9 @@ } }, "params": { - "Region": "eu-west-3", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "eu-west-3" } }, { @@ -593,9 +593,9 @@ } }, "params": { - "Region": "eu-west-3", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "eu-west-3" } }, { @@ -606,9 +606,9 @@ } }, "params": { - "Region": "eu-west-3", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "eu-west-3" } }, { @@ -619,9 +619,9 @@ } }, "params": { - "Region": "eu-west-3", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "eu-west-3" } }, { @@ -632,9 +632,9 @@ } }, "params": { - "Region": "eu-west-2", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "eu-west-2" } }, { @@ -645,9 +645,9 @@ } }, "params": { - "Region": "eu-west-2", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "eu-west-2" } }, { @@ -658,9 +658,9 @@ } }, "params": { - "Region": "eu-west-2", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "eu-west-2" } }, { @@ -671,9 +671,9 @@ } }, "params": { - "Region": "eu-west-2", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "eu-west-2" } }, { @@ -684,9 +684,9 @@ } }, "params": { - "Region": "eu-west-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "eu-west-1" } }, { @@ -697,9 +697,9 @@ } }, "params": { - "Region": "eu-west-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "eu-west-1" } }, { @@ -710,9 +710,9 @@ } }, "params": { - "Region": "eu-west-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "eu-west-1" } }, { @@ -723,9 +723,9 @@ } }, "params": { - "Region": "eu-west-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "eu-west-1" } }, { @@ -736,9 +736,9 @@ } }, "params": { - "Region": "ap-northeast-3", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-northeast-3" } }, { @@ -749,9 +749,9 @@ } }, "params": { - "Region": "ap-northeast-3", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-northeast-3" } }, { @@ -762,9 +762,9 @@ } }, "params": { - "Region": "ap-northeast-3", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-northeast-3" } }, { @@ -775,9 +775,9 @@ } }, "params": { - "Region": "ap-northeast-3", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-northeast-3" } }, { @@ -788,9 +788,9 @@ } }, "params": { - "Region": "ap-northeast-2", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-northeast-2" } }, { @@ -801,9 +801,9 @@ } }, "params": { - "Region": "ap-northeast-2", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-northeast-2" } }, { @@ -814,9 +814,9 @@ } }, "params": { - "Region": "ap-northeast-2", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-northeast-2" } }, { @@ -827,9 +827,9 @@ } }, "params": { - "Region": "ap-northeast-2", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-northeast-2" } }, { @@ -840,9 +840,9 @@ } }, "params": { - "Region": "ap-northeast-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-northeast-1" } }, { @@ -853,9 +853,9 @@ } }, "params": { - "Region": "ap-northeast-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-northeast-1" } }, { @@ -866,9 +866,9 @@ } }, "params": { - "Region": "ap-northeast-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-northeast-1" } }, { @@ -879,9 +879,9 @@ } }, "params": { - "Region": "ap-northeast-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-northeast-1" } }, { @@ -892,9 +892,9 @@ } }, "params": { - "Region": "me-south-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "me-south-1" } }, { @@ -905,9 +905,9 @@ } }, "params": { - "Region": "me-south-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "me-south-1" } }, { @@ -918,9 +918,9 @@ } }, "params": { - "Region": "me-south-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "me-south-1" } }, { @@ -931,9 +931,9 @@ } }, "params": { - "Region": "me-south-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "me-south-1" } }, { @@ -944,9 +944,9 @@ } }, "params": { - "Region": "sa-east-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "sa-east-1" } }, { @@ -957,9 +957,9 @@ } }, "params": { - "Region": "sa-east-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "sa-east-1" } }, { @@ -970,9 +970,9 @@ } }, "params": { - "Region": "sa-east-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "sa-east-1" } }, { @@ -983,9 +983,9 @@ } }, "params": { - "Region": "sa-east-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "sa-east-1" } }, { @@ -996,9 +996,9 @@ } }, "params": { - "Region": "ap-east-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-east-1" } }, { @@ -1009,9 +1009,9 @@ } }, "params": { - "Region": "ap-east-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-east-1" } }, { @@ -1022,9 +1022,9 @@ } }, "params": { - "Region": "ap-east-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-east-1" } }, { @@ -1035,9 +1035,9 @@ } }, "params": { - "Region": "ap-east-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-east-1" } }, { @@ -1048,9 +1048,9 @@ } }, "params": { - "Region": "cn-north-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "cn-north-1" } }, { @@ -1061,9 +1061,9 @@ } }, "params": { - "Region": "cn-north-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "cn-north-1" } }, { @@ -1074,9 +1074,9 @@ } }, "params": { - "Region": "cn-north-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "cn-north-1" } }, { @@ -1087,9 +1087,9 @@ } }, "params": { - "Region": "cn-north-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "cn-north-1" } }, { @@ -1100,9 +1100,9 @@ } }, "params": { - "Region": "us-gov-west-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-gov-west-1" } }, { @@ -1113,9 +1113,9 @@ } }, "params": { - "Region": "us-gov-west-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-gov-west-1" } }, { @@ -1126,9 +1126,9 @@ } }, "params": { - "Region": "us-gov-west-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-gov-west-1" } }, { @@ -1139,9 +1139,9 @@ } }, "params": { - "Region": "us-gov-west-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-gov-west-1" } }, { @@ -1152,9 +1152,9 @@ } }, "params": { - "Region": "ap-southeast-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-southeast-1" } }, { @@ -1165,9 +1165,9 @@ } }, "params": { - "Region": "ap-southeast-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-southeast-1" } }, { @@ -1178,9 +1178,9 @@ } }, "params": { - "Region": "ap-southeast-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-southeast-1" } }, { @@ -1191,9 +1191,9 @@ } }, "params": { - "Region": "ap-southeast-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-southeast-1" } }, { @@ -1204,9 +1204,9 @@ } }, "params": { - "Region": "ap-southeast-2", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-southeast-2" } }, { @@ -1217,9 +1217,9 @@ } }, "params": { - "Region": "ap-southeast-2", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-southeast-2" } }, { @@ -1230,9 +1230,9 @@ } }, "params": { - "Region": "ap-southeast-2", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-southeast-2" } }, { @@ -1243,9 +1243,9 @@ } }, "params": { - "Region": "ap-southeast-2", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-southeast-2" } }, { @@ -1254,9 +1254,9 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "Region": "us-iso-east-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-iso-east-1" } }, { @@ -1267,9 +1267,9 @@ } }, "params": { - "Region": "us-iso-east-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-iso-east-1" } }, { @@ -1278,9 +1278,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "Region": "us-iso-east-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-iso-east-1" } }, { @@ -1291,9 +1291,9 @@ } }, "params": { - "Region": "us-iso-east-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-iso-east-1" } }, { @@ -1304,9 +1304,9 @@ } }, "params": { - "Region": "ap-southeast-3", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "ap-southeast-3" } }, { @@ -1317,9 +1317,9 @@ } }, "params": { - "Region": "ap-southeast-3", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "ap-southeast-3" } }, { @@ -1330,9 +1330,9 @@ } }, "params": { - "Region": "ap-southeast-3", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "ap-southeast-3" } }, { @@ -1343,9 +1343,9 @@ } }, "params": { - "Region": "ap-southeast-3", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "ap-southeast-3" } }, { @@ -1356,9 +1356,9 @@ } }, "params": { - "Region": "us-east-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-east-1" } }, { @@ -1369,9 +1369,9 @@ } }, "params": { - "Region": "us-east-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-east-1" } }, { @@ -1382,9 +1382,9 @@ } }, "params": { - "Region": "us-east-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-east-1" } }, { @@ -1395,9 +1395,9 @@ } }, "params": { - "Region": "us-east-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-east-1" } }, { @@ -1408,9 +1408,9 @@ } }, "params": { - "Region": "us-east-2", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-east-2" } }, { @@ -1421,9 +1421,9 @@ } }, "params": { - "Region": "us-east-2", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-east-2" } }, { @@ -1434,9 +1434,9 @@ } }, "params": { - "Region": "us-east-2", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-east-2" } }, { @@ -1447,9 +1447,9 @@ } }, "params": { - "Region": "us-east-2", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-east-2" } }, { @@ -1460,9 +1460,9 @@ } }, "params": { - "Region": "cn-northwest-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "cn-northwest-1" } }, { @@ -1473,9 +1473,9 @@ } }, "params": { - "Region": "cn-northwest-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "cn-northwest-1" } }, { @@ -1486,9 +1486,9 @@ } }, "params": { - "Region": "cn-northwest-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "cn-northwest-1" } }, { @@ -1499,9 +1499,9 @@ } }, "params": { - "Region": "cn-northwest-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "cn-northwest-1" } }, { @@ -1510,9 +1510,9 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { - "Region": "us-isob-east-1", + "UseDualStack": true, "UseFIPS": true, - "UseDualStack": true + "Region": "us-isob-east-1" } }, { @@ -1523,9 +1523,9 @@ } }, "params": { - "Region": "us-isob-east-1", + "UseDualStack": false, "UseFIPS": true, - "UseDualStack": false + "Region": "us-isob-east-1" } }, { @@ -1534,9 +1534,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { - "Region": "us-isob-east-1", + "UseDualStack": true, "UseFIPS": false, - "UseDualStack": true + "Region": "us-isob-east-1" } }, { @@ -1547,9 +1547,9 @@ } }, "params": { - "Region": "us-isob-east-1", + "UseDualStack": false, "UseFIPS": false, - "UseDualStack": false + "Region": "us-isob-east-1" } }, { @@ -1560,9 +1560,9 @@ } }, "params": { - "Region": "us-east-1", - "UseFIPS": false, "UseDualStack": false, + "UseFIPS": false, + "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -1572,9 +1572,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { - "Region": "us-east-1", - "UseFIPS": true, "UseDualStack": false, + "UseFIPS": true, + "Region": "us-east-1", "Endpoint": "https://example.com" } }, @@ -1584,9 +1584,9 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { - "Region": "us-east-1", - "UseFIPS": false, "UseDualStack": true, + "UseFIPS": false, + "Region": "us-east-1", "Endpoint": "https://example.com" } } diff --git a/models/apis/iot/2015-05-28/api-2.json b/models/apis/iot/2015-05-28/api-2.json index 9084c95ae5a..0ed07b7d14e 100644 --- a/models/apis/iot/2015-05-28/api-2.json +++ b/models/apis/iot/2015-05-28/api-2.json @@ -2682,6 +2682,21 @@ {"shape":"UnauthorizedException"} ] }, + "ListRelatedResourcesForAuditFinding":{ + "name":"ListRelatedResourcesForAuditFinding", + "http":{ + "method":"GET", + "requestUri":"/audit/relatedResources" + }, + "input":{"shape":"ListRelatedResourcesForAuditFindingRequest"}, + "output":{"shape":"ListRelatedResourcesForAuditFindingResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"InvalidRequestException"}, + {"shape":"ThrottlingException"}, + {"shape":"InternalFailureException"} + ] + }, "ListRoleAliases":{ "name":"ListRoleAliases", "http":{ @@ -8494,6 +8509,29 @@ "IsDefaultVersion":{"type":"boolean"}, "IsDisabled":{"type":"boolean"}, "IsSuppressed":{"type":"boolean"}, + "IssuerCertificateIdentifier":{ + "type":"structure", + "members":{ + "issuerCertificateSubject":{"shape":"IssuerCertificateSubject"}, + "issuerId":{"shape":"IssuerId"}, + "issuerCertificateSerialNumber":{"shape":"IssuerCertificateSerialNumber"} + } + }, + "IssuerCertificateSerialNumber":{ + "type":"string", + "max":20, + "pattern":"[a-fA-F0-9:]+" + }, + "IssuerCertificateSubject":{ + "type":"string", + "max":1000, + "pattern":"[\\p{Graph}\\x20]*" + }, + "IssuerId":{ + "type":"string", + "max":64, + "pattern":"(0x)?[a-fA-F0-9]+" + }, "Job":{ "type":"structure", "members":{ @@ -9876,6 +9914,34 @@ "nextToken":{"shape":"NextToken"} } }, + "ListRelatedResourcesForAuditFindingRequest":{ + "type":"structure", + "required":["findingId"], + "members":{ + "findingId":{ + "shape":"FindingId", + "location":"querystring", + "locationName":"findingId" + }, + "nextToken":{ + "shape":"NextToken", + "location":"querystring", + "locationName":"nextToken" + }, + "maxResults":{ + "shape":"MaxResults", + "location":"querystring", + "locationName":"maxResults" + } + } + }, + "ListRelatedResourcesForAuditFindingResponse":{ + "type":"structure", + "members":{ + "relatedResources":{"shape":"RelatedResources"}, + "nextToken":{"shape":"NextToken"} + } + }, "ListRoleAliasesRequest":{ "type":"structure", "members":{ @@ -11576,7 +11642,9 @@ "policyVersionIdentifier":{"shape":"PolicyVersionIdentifier"}, "account":{"shape":"AwsAccountId"}, "iamRoleArn":{"shape":"RoleArn"}, - "roleAliasArn":{"shape":"RoleAliasArn"} + "roleAliasArn":{"shape":"RoleAliasArn"}, + "issuerCertificateIdentifier":{"shape":"IssuerCertificateIdentifier"}, + "deviceCertificateArn":{"shape":"CertificateArn"} } }, "ResourceLogicalId":{"type":"string"}, @@ -11606,7 +11674,8 @@ "CLIENT_ID", "ACCOUNT_SETTINGS", "ROLE_ALIAS", - "IAM_ROLE" + "IAM_ROLE", + "ISSUER_CERTIFICATE" ] }, "Resources":{ diff --git a/models/apis/iot/2015-05-28/docs-2.json b/models/apis/iot/2015-05-28/docs-2.json index c07c2797017..f2005ca049c 100644 --- a/models/apis/iot/2015-05-28/docs-2.json +++ b/models/apis/iot/2015-05-28/docs-2.json @@ -168,6 +168,7 @@ "ListPrincipalThings": "

Lists the things associated with the specified principal. A principal can be X.509 certificates, IAM users, groups, and roles, Amazon Cognito identities or federated identities.

Requires permission to access the ListPrincipalThings action.

", "ListProvisioningTemplateVersions": "

A list of provisioning template versions.

Requires permission to access the ListProvisioningTemplateVersions action.

", "ListProvisioningTemplates": "

Lists the provisioning templates in your Amazon Web Services account.

Requires permission to access the ListProvisioningTemplates action.

", + "ListRelatedResourcesForAuditFinding": "

The related resources of an Audit finding. The following resources can be returned from calling this API:

This API is similar to DescribeAuditFinding's RelatedResources but provides pagination and is not limited to 10 resources. When calling DescribeAuditFinding for the intermediate CA revoked for active device certificates check, RelatedResources will not be populated. You must use this API, ListRelatedResourcesForAuditFinding, to list the certificates.

", "ListRoleAliases": "

Lists the role aliases registered in your account.

Requires permission to access the ListRoleAliases action.

", "ListScheduledAudits": "

Lists all of your scheduled audits.

Requires permission to access the ListScheduledAudits action.

", "ListSecurityProfiles": "

Lists the Device Defender security profiles you've created. You can filter security profiles by dimension or custom metric.

Requires permission to access the ListSecurityProfiles action.

dimensionName and metricName cannot be used in the same request.

", @@ -182,7 +183,7 @@ "ListThingRegistrationTaskReports": "

Information about the thing registration tasks.

", "ListThingRegistrationTasks": "

List bulk thing provisioning tasks.

Requires permission to access the ListThingRegistrationTasks action.

", "ListThingTypes": "

Lists the existing thing types.

Requires permission to access the ListThingTypes action.

", - "ListThings": "

Lists your things. Use the attributeName and attributeValue parameters to filter your things. For example, calling ListThings with attributeName=Color and attributeValue=Red retrieves all things in the registry that contain an attribute Color with the value Red.

Requires permission to access the ListThings action.

You will not be charged for calling this API if an Access denied error is returned. You will also not be charged if no attributes or pagination token was provided in request and no pagination token and no results were returned.

", + "ListThings": "

Lists your things. Use the attributeName and attributeValue parameters to filter your things. For example, calling ListThings with attributeName=Color and attributeValue=Red retrieves all things in the registry that contain an attribute Color with the value Red. For more information, see List Things from the Amazon Web Services IoT Core Developer Guide.

Requires permission to access the ListThings action.

You will not be charged for calling this API if an Access denied error is returned. You will also not be charged if no attributes or pagination token was provided in request and no pagination token and no results were returned.

", "ListThingsInBillingGroup": "

Lists the things you have added to the given billing group.

Requires permission to access the ListThingsInBillingGroup action.

", "ListThingsInThingGroup": "

Lists the things in the specified group.

Requires permission to access the ListThingsInThingGroup action.

", "ListTopicRuleDestinations": "

Lists all the topic rule destinations in your Amazon Web Services account.

Requires permission to access the ListTopicRuleDestinations action.

", @@ -1474,6 +1475,7 @@ "RegisterCACertificateResponse$certificateArn": "

The CA certificate ARN.

", "RegisterCertificateResponse$certificateArn": "

The certificate ARN.

", "RegisterCertificateWithoutCAResponse$certificateArn": "

The Amazon Resource Name (ARN) of the registered certificate.

", + "ResourceIdentifier$deviceCertificateArn": "

The ARN of the identified device certificate.

", "SigningProfileParameter$certificateArn": "

Certificate ARN.

", "TransferCertificateResponse$transferredCertificateArn": "

The ARN of the certificate.

" } @@ -3466,7 +3468,8 @@ "DescribeAuditFindingRequest$findingId": "

A unique identifier for a single audit finding. You can use this identifier to apply mitigation actions to the finding.

", "FindingIds$member": null, "ListAuditMitigationActionsExecutionsRequest$findingId": "

Specify this filter to limit results to those that were applied to a specific audit finding.

", - "ListAuditMitigationActionsTasksRequest$findingId": "

Specify this filter to limit results to tasks that were applied to a specific audit finding.

" + "ListAuditMitigationActionsTasksRequest$findingId": "

Specify this filter to limit results to tasks that were applied to a specific audit finding.

", + "ListRelatedResourcesForAuditFindingRequest$findingId": "

The finding Id.

" } }, "FindingIds": { @@ -4050,6 +4053,30 @@ "AuditFinding$isSuppressed": "

Indicates whether the audit finding was suppressed or not during reporting.

" } }, + "IssuerCertificateIdentifier": { + "base": "

The certificate issuer indentifier.

", + "refs": { + "ResourceIdentifier$issuerCertificateIdentifier": "

The issuer certificate identifier.

" + } + }, + "IssuerCertificateSerialNumber": { + "base": null, + "refs": { + "IssuerCertificateIdentifier$issuerCertificateSerialNumber": "

The issuer certificate serial number.

" + } + }, + "IssuerCertificateSubject": { + "base": null, + "refs": { + "IssuerCertificateIdentifier$issuerCertificateSubject": "

The subject of the issuer certificate.

" + } + }, + "IssuerId": { + "base": null, + "refs": { + "IssuerCertificateIdentifier$issuerId": "

The issuer ID.

" + } + }, "Job": { "base": "

The Job object contains details about a job.

", "refs": { @@ -4704,6 +4731,16 @@ "refs": { } }, + "ListRelatedResourcesForAuditFindingRequest": { + "base": null, + "refs": { + } + }, + "ListRelatedResourcesForAuditFindingResponse": { + "base": null, + "refs": { + } + }, "ListRoleAliasesRequest": { "base": null, "refs": { @@ -5097,6 +5134,7 @@ "ListOTAUpdatesRequest$maxResults": "

The maximum number of results to return at one time.

", "ListProvisioningTemplateVersionsRequest$maxResults": "

The maximum number of results to return at one time.

", "ListProvisioningTemplatesRequest$maxResults": "

The maximum number of results to return at one time.

", + "ListRelatedResourcesForAuditFindingRequest$maxResults": "

The maximum number of results to return at one time.

", "ListScheduledAuditsRequest$maxResults": "

The maximum number of results to return at one time. The default is 25.

", "ListSecurityProfilesForTargetRequest$maxResults": "

The maximum number of results to return at one time.

", "ListSecurityProfilesRequest$maxResults": "

The maximum number of results to return at one time.

", @@ -5426,6 +5464,8 @@ "ListProvisioningTemplateVersionsResponse$nextToken": "

A token to retrieve the next set of results.

", "ListProvisioningTemplatesRequest$nextToken": "

A token to retrieve the next set of results.

", "ListProvisioningTemplatesResponse$nextToken": "

A token to retrieve the next set of results.

", + "ListRelatedResourcesForAuditFindingRequest$nextToken": "

A token that can be used to retrieve the next set of results, or null if there are no additional results.

", + "ListRelatedResourcesForAuditFindingResponse$nextToken": "

A token that can be used to retrieve the next set of results, or null for the first API call.

", "ListScheduledAuditsRequest$nextToken": "

The token for the next set of results.

", "ListScheduledAuditsResponse$nextToken": "

A token that can be used to retrieve the next set of results, or null if there are no additional results.

", "ListSecurityProfilesForTargetRequest$nextToken": "

The token for the next set of results.

", @@ -6303,7 +6343,8 @@ "RelatedResources": { "base": null, "refs": { - "AuditFinding$relatedResources": "

The list of related resources.

" + "AuditFinding$relatedResources": "

The list of related resources.

", + "ListRelatedResourcesForAuditFindingResponse$relatedResources": "

The related resources.

" } }, "RemoveAuthorizerConfig": { diff --git a/models/apis/iot/2015-05-28/endpoint-tests-1.json b/models/apis/iot/2015-05-28/endpoint-tests-1.json index 78c241bcfbd..43cfd17ca5a 100644 --- a/models/apis/iot/2015-05-28/endpoint-tests-1.json +++ b/models/apis/iot/2015-05-28/endpoint-tests-1.json @@ -8,9 +8,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ap-south-1", - "UseDualStack": true + "Region": "ap-south-1" } }, { @@ -21,9 +21,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-south-1", - "UseDualStack": false + "Region": "ap-south-1" } }, { @@ -34,9 +34,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ap-south-1", - "UseDualStack": true + "Region": "ap-south-1" } }, { @@ -47,9 +47,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-south-1", - "UseDualStack": false + "Region": "ap-south-1" } }, { @@ -60,9 +60,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "us-gov-east-1", - "UseDualStack": true + "Region": "us-gov-east-1" } }, { @@ -73,9 +73,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-gov-east-1", - "UseDualStack": false + "Region": "us-gov-east-1" } }, { @@ -86,9 +86,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "us-gov-east-1", - "UseDualStack": true + "Region": "us-gov-east-1" } }, { @@ -99,9 +99,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-gov-east-1", - "UseDualStack": false + "Region": "us-gov-east-1" } }, { @@ -112,9 +112,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "me-central-1", - "UseDualStack": true + "Region": "me-central-1" } }, { @@ -125,9 +125,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "me-central-1", - "UseDualStack": false + "Region": "me-central-1" } }, { @@ -138,9 +138,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "me-central-1", - "UseDualStack": true + "Region": "me-central-1" } }, { @@ -151,9 +151,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "me-central-1", - "UseDualStack": false + "Region": "me-central-1" } }, { @@ -164,9 +164,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ca-central-1", - "UseDualStack": true + "Region": "ca-central-1" } }, { @@ -177,9 +177,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ca-central-1", - "UseDualStack": false + "Region": "ca-central-1" } }, { @@ -190,9 +190,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ca-central-1", - "UseDualStack": true + "Region": "ca-central-1" } }, { @@ -203,9 +203,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ca-central-1", - "UseDualStack": false + "Region": "ca-central-1" } }, { @@ -216,9 +216,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "eu-central-1", - "UseDualStack": true + "Region": "eu-central-1" } }, { @@ -229,9 +229,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "eu-central-1", - "UseDualStack": false + "Region": "eu-central-1" } }, { @@ -242,9 +242,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "eu-central-1", - "UseDualStack": true + "Region": "eu-central-1" } }, { @@ -255,9 +255,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "eu-central-1", - "UseDualStack": false + "Region": "eu-central-1" } }, { @@ -268,9 +268,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "us-west-1", - "UseDualStack": true + "Region": "us-west-1" } }, { @@ -281,9 +281,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-west-1", - "UseDualStack": false + "Region": "us-west-1" } }, { @@ -294,9 +294,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "us-west-1", - "UseDualStack": true + "Region": "us-west-1" } }, { @@ -307,9 +307,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-west-1", - "UseDualStack": false + "Region": "us-west-1" } }, { @@ -320,9 +320,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "us-west-2", - "UseDualStack": true + "Region": "us-west-2" } }, { @@ -333,9 +333,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-west-2", - "UseDualStack": false + "Region": "us-west-2" } }, { @@ -346,9 +346,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "us-west-2", - "UseDualStack": true + "Region": "us-west-2" } }, { @@ -359,9 +359,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-west-2", - "UseDualStack": false + "Region": "us-west-2" } }, { @@ -372,9 +372,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "eu-north-1", - "UseDualStack": true + "Region": "eu-north-1" } }, { @@ -385,9 +385,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "eu-north-1", - "UseDualStack": false + "Region": "eu-north-1" } }, { @@ -398,9 +398,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "eu-north-1", - "UseDualStack": true + "Region": "eu-north-1" } }, { @@ -411,9 +411,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "eu-north-1", - "UseDualStack": false + "Region": "eu-north-1" } }, { @@ -424,9 +424,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "eu-west-3", - "UseDualStack": true + "Region": "eu-west-3" } }, { @@ -437,9 +437,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "eu-west-3", - "UseDualStack": false + "Region": "eu-west-3" } }, { @@ -450,9 +450,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "eu-west-3", - "UseDualStack": true + "Region": "eu-west-3" } }, { @@ -463,9 +463,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "eu-west-3", - "UseDualStack": false + "Region": "eu-west-3" } }, { @@ -476,9 +476,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "eu-west-2", - "UseDualStack": true + "Region": "eu-west-2" } }, { @@ -489,9 +489,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "eu-west-2", - "UseDualStack": false + "Region": "eu-west-2" } }, { @@ -502,9 +502,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "eu-west-2", - "UseDualStack": true + "Region": "eu-west-2" } }, { @@ -515,9 +515,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "eu-west-2", - "UseDualStack": false + "Region": "eu-west-2" } }, { @@ -528,9 +528,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "eu-west-1", - "UseDualStack": true + "Region": "eu-west-1" } }, { @@ -541,9 +541,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "eu-west-1", - "UseDualStack": false + "Region": "eu-west-1" } }, { @@ -554,9 +554,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "eu-west-1", - "UseDualStack": true + "Region": "eu-west-1" } }, { @@ -567,9 +567,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "eu-west-1", - "UseDualStack": false + "Region": "eu-west-1" } }, { @@ -580,9 +580,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ap-northeast-2", - "UseDualStack": true + "Region": "ap-northeast-2" } }, { @@ -593,9 +593,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-northeast-2", - "UseDualStack": false + "Region": "ap-northeast-2" } }, { @@ -606,9 +606,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ap-northeast-2", - "UseDualStack": true + "Region": "ap-northeast-2" } }, { @@ -619,9 +619,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-northeast-2", - "UseDualStack": false + "Region": "ap-northeast-2" } }, { @@ -632,9 +632,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ap-northeast-1", - "UseDualStack": true + "Region": "ap-northeast-1" } }, { @@ -645,9 +645,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-northeast-1", - "UseDualStack": false + "Region": "ap-northeast-1" } }, { @@ -658,9 +658,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ap-northeast-1", - "UseDualStack": true + "Region": "ap-northeast-1" } }, { @@ -671,9 +671,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-northeast-1", - "UseDualStack": false + "Region": "ap-northeast-1" } }, { @@ -684,9 +684,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "me-south-1", - "UseDualStack": true + "Region": "me-south-1" } }, { @@ -697,9 +697,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "me-south-1", - "UseDualStack": false + "Region": "me-south-1" } }, { @@ -710,9 +710,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "me-south-1", - "UseDualStack": true + "Region": "me-south-1" } }, { @@ -723,9 +723,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "me-south-1", - "UseDualStack": false + "Region": "me-south-1" } }, { @@ -736,9 +736,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "sa-east-1", - "UseDualStack": true + "Region": "sa-east-1" } }, { @@ -749,9 +749,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "sa-east-1", - "UseDualStack": false + "Region": "sa-east-1" } }, { @@ -762,9 +762,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "sa-east-1", - "UseDualStack": true + "Region": "sa-east-1" } }, { @@ -775,9 +775,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "sa-east-1", - "UseDualStack": false + "Region": "sa-east-1" } }, { @@ -788,9 +788,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ap-east-1", - "UseDualStack": true + "Region": "ap-east-1" } }, { @@ -801,9 +801,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-east-1", - "UseDualStack": false + "Region": "ap-east-1" } }, { @@ -814,9 +814,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ap-east-1", - "UseDualStack": true + "Region": "ap-east-1" } }, { @@ -827,9 +827,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-east-1", - "UseDualStack": false + "Region": "ap-east-1" } }, { @@ -840,9 +840,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "cn-north-1", - "UseDualStack": true + "Region": "cn-north-1" } }, { @@ -853,9 +853,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "cn-north-1", - "UseDualStack": false + "Region": "cn-north-1" } }, { @@ -866,9 +866,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "cn-north-1", - "UseDualStack": true + "Region": "cn-north-1" } }, { @@ -879,9 +879,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "cn-north-1", - "UseDualStack": false + "Region": "cn-north-1" } }, { @@ -892,9 +892,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "us-gov-west-1", - "UseDualStack": true + "Region": "us-gov-west-1" } }, { @@ -905,9 +905,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-gov-west-1", - "UseDualStack": false + "Region": "us-gov-west-1" } }, { @@ -918,9 +918,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "us-gov-west-1", - "UseDualStack": true + "Region": "us-gov-west-1" } }, { @@ -931,9 +931,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-gov-west-1", - "UseDualStack": false + "Region": "us-gov-west-1" } }, { @@ -944,9 +944,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ap-southeast-1", - "UseDualStack": true + "Region": "ap-southeast-1" } }, { @@ -957,9 +957,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-southeast-1", - "UseDualStack": false + "Region": "ap-southeast-1" } }, { @@ -970,9 +970,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ap-southeast-1", - "UseDualStack": true + "Region": "ap-southeast-1" } }, { @@ -983,9 +983,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-southeast-1", - "UseDualStack": false + "Region": "ap-southeast-1" } }, { @@ -996,9 +996,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ap-southeast-2", - "UseDualStack": true + "Region": "ap-southeast-2" } }, { @@ -1009,9 +1009,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-southeast-2", - "UseDualStack": false + "Region": "ap-southeast-2" } }, { @@ -1022,9 +1022,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ap-southeast-2", - "UseDualStack": true + "Region": "ap-southeast-2" } }, { @@ -1035,9 +1035,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-southeast-2", - "UseDualStack": false + "Region": "ap-southeast-2" } }, { @@ -1046,9 +1046,9 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "us-iso-east-1", - "UseDualStack": true + "Region": "us-iso-east-1" } }, { @@ -1059,9 +1059,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-iso-east-1", - "UseDualStack": false + "Region": "us-iso-east-1" } }, { @@ -1070,9 +1070,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "us-iso-east-1", - "UseDualStack": true + "Region": "us-iso-east-1" } }, { @@ -1083,9 +1083,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-iso-east-1", - "UseDualStack": false + "Region": "us-iso-east-1" } }, { @@ -1096,9 +1096,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "us-east-1", - "UseDualStack": true + "Region": "us-east-1" } }, { @@ -1109,9 +1109,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-east-1", - "UseDualStack": false + "Region": "us-east-1" } }, { @@ -1122,9 +1122,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "us-east-1", - "UseDualStack": true + "Region": "us-east-1" } }, { @@ -1135,9 +1135,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-east-1", - "UseDualStack": false + "Region": "us-east-1" } }, { @@ -1148,9 +1148,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "us-east-2", - "UseDualStack": true + "Region": "us-east-2" } }, { @@ -1161,9 +1161,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-east-2", - "UseDualStack": false + "Region": "us-east-2" } }, { @@ -1174,9 +1174,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "us-east-2", - "UseDualStack": true + "Region": "us-east-2" } }, { @@ -1187,9 +1187,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-east-2", - "UseDualStack": false + "Region": "us-east-2" } }, { @@ -1200,9 +1200,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "cn-northwest-1", - "UseDualStack": true + "Region": "cn-northwest-1" } }, { @@ -1213,9 +1213,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "cn-northwest-1", - "UseDualStack": false + "Region": "cn-northwest-1" } }, { @@ -1226,9 +1226,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "cn-northwest-1", - "UseDualStack": true + "Region": "cn-northwest-1" } }, { @@ -1239,9 +1239,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "cn-northwest-1", - "UseDualStack": false + "Region": "cn-northwest-1" } }, { @@ -1250,9 +1250,9 @@ "error": "FIPS and DualStack are enabled, but this partition does not support one or both" }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "us-isob-east-1", - "UseDualStack": true + "Region": "us-isob-east-1" } }, { @@ -1263,9 +1263,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-isob-east-1", - "UseDualStack": false + "Region": "us-isob-east-1" } }, { @@ -1274,9 +1274,9 @@ "error": "DualStack is enabled but this partition does not support DualStack" }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "us-isob-east-1", - "UseDualStack": true + "Region": "us-isob-east-1" } }, { @@ -1287,9 +1287,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-isob-east-1", - "UseDualStack": false + "Region": "us-isob-east-1" } }, { @@ -1300,9 +1300,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, "Region": "us-east-1", - "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -1312,9 +1312,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { + "UseDualStack": false, "UseFIPS": true, "Region": "us-east-1", - "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -1324,9 +1324,9 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { + "UseDualStack": true, "UseFIPS": false, "Region": "us-east-1", - "UseDualStack": true, "Endpoint": "https://example.com" } } diff --git a/models/apis/license-manager/2018-08-01/api-2.json b/models/apis/license-manager/2018-08-01/api-2.json index 0fb37b064ba..0737485ea62 100644 --- a/models/apis/license-manager/2018-08-01/api-2.json +++ b/models/apis/license-manager/2018-08-01/api-2.json @@ -649,6 +649,24 @@ {"shape":"RateLimitExceededException"} ] }, + "ListReceivedGrantsForOrganization":{ + "name":"ListReceivedGrantsForOrganization", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"ListReceivedGrantsForOrganizationRequest"}, + "output":{"shape":"ListReceivedGrantsForOrganizationResponse"}, + "errors":[ + {"shape":"ValidationException"}, + {"shape":"InvalidParameterValueException"}, + {"shape":"ResourceLimitExceededException"}, + {"shape":"ServerInternalException"}, + {"shape":"AuthorizationException"}, + {"shape":"AccessDeniedException"}, + {"shape":"RateLimitExceededException"} + ] + }, "ListReceivedLicenses":{ "name":"ListReceivedLicenses", "http":{ @@ -667,6 +685,24 @@ {"shape":"RateLimitExceededException"} ] }, + "ListReceivedLicensesForOrganization":{ + "name":"ListReceivedLicensesForOrganization", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"ListReceivedLicensesForOrganizationRequest"}, + "output":{"shape":"ListReceivedLicensesForOrganizationResponse"}, + "errors":[ + {"shape":"ValidationException"}, + {"shape":"InvalidParameterValueException"}, + {"shape":"ResourceLimitExceededException"}, + {"shape":"ServerInternalException"}, + {"shape":"AuthorizationException"}, + {"shape":"AccessDeniedException"}, + {"shape":"RateLimitExceededException"} + ] + }, "ListResourceInventory":{ "name":"ListResourceInventory", "http":{ @@ -2123,6 +2159,23 @@ "NextToken":{"shape":"String"} } }, + "ListReceivedGrantsForOrganizationRequest":{ + "type":"structure", + "required":["LicenseArn"], + "members":{ + "LicenseArn":{"shape":"Arn"}, + "Filters":{"shape":"FilterList"}, + "NextToken":{"shape":"String"}, + "MaxResults":{"shape":"MaxSize100"} + } + }, + "ListReceivedGrantsForOrganizationResponse":{ + "type":"structure", + "members":{ + "Grants":{"shape":"GrantList"}, + "NextToken":{"shape":"String"} + } + }, "ListReceivedGrantsRequest":{ "type":"structure", "members":{ @@ -2139,6 +2192,21 @@ "NextToken":{"shape":"String"} } }, + "ListReceivedLicensesForOrganizationRequest":{ + "type":"structure", + "members":{ + "Filters":{"shape":"FilterList"}, + "NextToken":{"shape":"String"}, + "MaxResults":{"shape":"MaxSize100"} + } + }, + "ListReceivedLicensesForOrganizationResponse":{ + "type":"structure", + "members":{ + "Licenses":{"shape":"GrantedLicenseList"}, + "NextToken":{"shape":"String"} + } + }, "ListReceivedLicensesRequest":{ "type":"structure", "members":{ diff --git a/models/apis/license-manager/2018-08-01/docs-2.json b/models/apis/license-manager/2018-08-01/docs-2.json index 2f4693a9761..60e19537e8c 100644 --- a/models/apis/license-manager/2018-08-01/docs-2.json +++ b/models/apis/license-manager/2018-08-01/docs-2.json @@ -5,7 +5,7 @@ "AcceptGrant": "

Accepts the specified grant.

", "CheckInLicense": "

Checks in the specified license. Check in a license when it is no longer in use.

", "CheckoutBorrowLicense": "

Checks out the specified license for offline use.

", - "CheckoutLicense": "

Checks out the specified license.

", + "CheckoutLicense": "

Checks out the specified license.

If the account that created the license is the same that is performing the check out, you must specify the account as the beneficiary.

", "CreateGrant": "

Creates a grant for the specified license. A grant shares the use of license entitlements with specific Amazon Web Services accounts.

", "CreateGrantVersion": "

Creates a new version of the specified grant.

", "CreateLicense": "

Creates a license.

", @@ -38,7 +38,9 @@ "ListLicenseVersions": "

Lists all versions of the specified license.

", "ListLicenses": "

Lists the licenses for your account.

", "ListReceivedGrants": "

Lists grants that are received but not accepted.

", + "ListReceivedGrantsForOrganization": "

Lists the grants received for all accounts in the organization.

", "ListReceivedLicenses": "

Lists received licenses.

", + "ListReceivedLicensesForOrganization": "

Lists the licenses received for all accounts in the organization.

", "ListResourceInventory": "

Lists resources managed using Systems Manager inventory.

", "ListTagsForResource": "

Lists the tags for the specified license configuration.

", "ListTokens": "

Lists your tokens.

", @@ -112,6 +114,7 @@ "GrantedLicense$LicenseArn": "

Amazon Resource Name (ARN) of the license.

", "License$LicenseArn": "

Amazon Resource Name (ARN) of the license.

", "ListLicenseVersionsRequest$LicenseArn": "

Amazon Resource Name (ARN) of the license.

", + "ListReceivedGrantsForOrganizationRequest$LicenseArn": "

The Amazon Resource Name (ARN) of the received license.

", "PrincipalArnList$member": null, "RejectGrantRequest$GrantArn": "

Amazon Resource Name (ARN) of the grant.

", "RejectGrantResponse$GrantArn": "

Grant ARN.

" @@ -536,7 +539,9 @@ "ListDistributedGrantsRequest$Filters": "

Filters to scope the results. The following filters are supported:

", "ListLicenseManagerReportGeneratorsRequest$Filters": "

Filters to scope the results. The following filters are supported:

", "ListLicensesRequest$Filters": "

Filters to scope the results. The following filters are supported:

", + "ListReceivedGrantsForOrganizationRequest$Filters": "

Filters to scope the results. The following filters are supported:

", "ListReceivedGrantsRequest$Filters": "

Filters to scope the results. The following filters are supported:

", + "ListReceivedLicensesForOrganizationRequest$Filters": "

Filters to scope the results. The following filters are supported:

", "ListReceivedLicensesRequest$Filters": "

Filters to scope the results. The following filters are supported:

", "ListTokensRequest$Filters": "

Filters to scope the results. The following filter is supported:

" } @@ -658,6 +663,7 @@ "base": null, "refs": { "ListDistributedGrantsResponse$Grants": "

Distributed grant details.

", + "ListReceivedGrantsForOrganizationResponse$Grants": "

Lists the grants the organization has received.

", "ListReceivedGrantsResponse$Grants": "

Received grant details.

" } }, @@ -682,6 +688,7 @@ "GrantedLicenseList": { "base": null, "refs": { + "ListReceivedLicensesForOrganizationResponse$Licenses": "

Lists the licenses the organization has received.

", "ListReceivedLicensesResponse$Licenses": "

Received license details.

" } }, @@ -802,8 +809,8 @@ "LicenseConversionContext": { "base": "

Information about a license type conversion task.

", "refs": { - "CreateLicenseConversionTaskForResourceRequest$SourceLicenseContext": "

Information that identifies the license type you are converting from. For the structure of the source license, see Convert a license type using the AWS CLI in the License Manager User Guide.

", - "CreateLicenseConversionTaskForResourceRequest$DestinationLicenseContext": "

Information that identifies the license type you are converting to. For the structure of the destination license, see Convert a license type using the AWS CLI in the License Manager User Guide.

", + "CreateLicenseConversionTaskForResourceRequest$SourceLicenseContext": "

Information that identifies the license type you are converting from. For the structure of the source license, see Convert a license type using the Amazon Web Services CLI in the License Manager User Guide.

", + "CreateLicenseConversionTaskForResourceRequest$DestinationLicenseContext": "

Information that identifies the license type you are converting to. For the structure of the destination license, see Convert a license type using the Amazon Web Services CLI in the License Manager User Guide.

", "GetLicenseConversionTaskResponse$SourceLicenseContext": "

Information about the license type converted from.

", "GetLicenseConversionTaskResponse$DestinationLicenseContext": "

Information about the license type converted to.

", "LicenseConversionTask$SourceLicenseContext": "

Information about the license type this conversion task converted from.

", @@ -996,6 +1003,16 @@ "refs": { } }, + "ListReceivedGrantsForOrganizationRequest": { + "base": null, + "refs": { + } + }, + "ListReceivedGrantsForOrganizationResponse": { + "base": null, + "refs": { + } + }, "ListReceivedGrantsRequest": { "base": null, "refs": { @@ -1006,6 +1023,16 @@ "refs": { } }, + "ListReceivedLicensesForOrganizationRequest": { + "base": null, + "refs": { + } + }, + "ListReceivedLicensesForOrganizationResponse": { + "base": null, + "refs": { + } + }, "ListReceivedLicensesRequest": { "base": null, "refs": { @@ -1088,7 +1115,9 @@ "ListLicenseManagerReportGeneratorsRequest$MaxResults": "

Maximum number of results to return in a single call.

", "ListLicenseVersionsRequest$MaxResults": "

Maximum number of results to return in a single call.

", "ListLicensesRequest$MaxResults": "

Maximum number of results to return in a single call.

", + "ListReceivedGrantsForOrganizationRequest$MaxResults": "

Maximum number of results to return in a single call.

", "ListReceivedGrantsRequest$MaxResults": "

Maximum number of results to return in a single call.

", + "ListReceivedLicensesForOrganizationRequest$MaxResults": "

Maximum number of results to return in a single call.

", "ListReceivedLicensesRequest$MaxResults": "

Maximum number of results to return in a single call.

", "ListTokensRequest$MaxResults": "

Maximum number of results to return in a single call.

" } @@ -1156,7 +1185,7 @@ "PrincipalArnList": { "base": null, "refs": { - "CreateGrantRequest$Principals": "

The grant principals.

" + "CreateGrantRequest$Principals": "

The grant principals. This value should be specified as an Amazon Resource Name (ARN).

" } }, "ProductInformation": { @@ -1480,8 +1509,12 @@ "ListLicenseVersionsResponse$NextToken": "

Token for the next set of results.

", "ListLicensesRequest$NextToken": "

Token for the next set of results.

", "ListLicensesResponse$NextToken": "

Token for the next set of results.

", + "ListReceivedGrantsForOrganizationRequest$NextToken": "

Token for the next set of results.

", + "ListReceivedGrantsForOrganizationResponse$NextToken": "

Token for the next set of results.

", "ListReceivedGrantsRequest$NextToken": "

Token for the next set of results.

", "ListReceivedGrantsResponse$NextToken": "

Token for the next set of results.

", + "ListReceivedLicensesForOrganizationRequest$NextToken": "

Token for the next set of results.

", + "ListReceivedLicensesForOrganizationResponse$NextToken": "

Token for the next set of results.

", "ListReceivedLicensesRequest$NextToken": "

Token for the next set of results.

", "ListReceivedLicensesResponse$NextToken": "

Token for the next set of results.

", "ListResourceInventoryRequest$NextToken": "

Token for the next set of results.

", diff --git a/models/apis/license-manager/2018-08-01/endpoint-rule-set-1.json b/models/apis/license-manager/2018-08-01/endpoint-rule-set-1.json new file mode 100644 index 00000000000..dc19c34614b --- /dev/null +++ b/models/apis/license-manager/2018-08-01/endpoint-rule-set-1.json @@ -0,0 +1,315 @@ +{ + "version": "1.0", + "parameters": { + "Region": { + "builtIn": "AWS::Region", + "required": false, + "documentation": "The AWS region used to dispatch the request.", + "type": "String" + }, + "UseDualStack": { + "builtIn": "AWS::UseDualStack", + "required": true, + "default": false, + "documentation": "When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.", + "type": "Boolean" + }, + "UseFIPS": { + "builtIn": "AWS::UseFIPS", + "required": true, + "default": false, + "documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.", + "type": "Boolean" + }, + "Endpoint": { + "builtIn": "SDK::Endpoint", + "required": false, + "documentation": "Override the endpoint used to send this request", + "type": "String" + } + }, + "rules": [ + { + "conditions": [ + { + "fn": "aws.partition", + "argv": [ + { + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Endpoint" + } + ] + }, + { + "fn": "parseURL", + "argv": [ + { + "ref": "Endpoint" + } + ], + "assign": "url" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://license-manager-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://license-manager-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://license-manager.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" + } + ] + }, + { + "conditions": [], + "endpoint": { + "url": "https://license-manager.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] +} \ No newline at end of file diff --git a/models/apis/license-manager/2018-08-01/endpoint-tests-1.json b/models/apis/license-manager/2018-08-01/endpoint-tests-1.json new file mode 100644 index 00000000000..af7cff56518 --- /dev/null +++ b/models/apis/license-manager/2018-08-01/endpoint-tests-1.json @@ -0,0 +1,1491 @@ +{ + "testCases": [ + { + "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-south-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-south-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.eu-south-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.eu-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.eu-south-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.eu-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.us-gov-east-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-gov-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-gov-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.us-gov-east-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-gov-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-gov-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ca-central-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ca-central-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ca-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ca-central-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ca-central-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ca-central-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ca-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ca-central-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.eu-central-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-central-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.eu-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-central-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.eu-central-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-central-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.eu-central-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-central-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.us-west-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.us-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.us-west-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.us-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.us-west-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-west-2", + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.us-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-west-2", + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.us-west-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-west-2", + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.us-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-west-2", + "UseDualStack": false + } + }, + { + "documentation": "For region af-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.af-south-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "af-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region af-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.af-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "af-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region af-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.af-south-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "af-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.af-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "af-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.eu-north-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-north-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.eu-north-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-north-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.eu-north-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-north-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.eu-north-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-north-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.eu-west-3.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-3", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.eu-west-3.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-3", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.eu-west-3.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-3", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.eu-west-3.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-3", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.eu-west-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-2", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.eu-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-2", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.eu-west-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-2", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.eu-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-2", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.eu-west-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.eu-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "eu-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.eu-west-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.eu-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "eu-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-northeast-3.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-3", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-northeast-3.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-3", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-northeast-3.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-3", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-northeast-3.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-3", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-northeast-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-2", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-2", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-northeast-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-2", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-2", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-northeast-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-northeast-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-northeast-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-northeast-1", + "UseDualStack": false + } + }, + { + "documentation": "For region me-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.me-south-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "me-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region me-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.me-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "me-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region me-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.me-south-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "me-south-1", + "UseDualStack": true + } + }, + { + "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.me-south-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "me-south-1", + "UseDualStack": false + } + }, + { + "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.sa-east-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "sa-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.sa-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "sa-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.sa-east-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "sa-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.sa-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "sa-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-east-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-east-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "UseFIPS": true, + "Region": "cn-north-1", + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "UseFIPS": true, + "Region": "cn-north-1", + "UseDualStack": false + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "UseFIPS": false, + "Region": "cn-north-1", + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "UseFIPS": false, + "Region": "cn-north-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.us-gov-west-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-gov-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.us-gov-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-gov-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.us-gov-west-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-gov-west-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.us-gov-west-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-gov-west-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-southeast-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-southeast-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-southeast-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-southeast-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-southeast-1", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-southeast-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-southeast-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-southeast-2", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-southeast-2", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-southeast-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-southeast-2", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-southeast-2", + "UseDualStack": false + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + }, + "params": { + "UseFIPS": true, + "Region": "us-iso-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.us-iso-east-1.c2s.ic.gov" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-iso-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "error": "DualStack is enabled but this partition does not support DualStack" + }, + "params": { + "UseFIPS": false, + "Region": "us-iso-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-iso-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.us-iso-east-1.c2s.ic.gov" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-iso-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-southeast-3.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-southeast-3", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.ap-southeast-3.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "ap-southeast-3", + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-southeast-3.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-southeast-3", + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.ap-southeast-3.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "ap-southeast-3", + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.us-east-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.us-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.us-east-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.us-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.us-east-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-east-2", + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.us-east-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-east-2", + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.us-east-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-2", + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.us-east-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-2", + "UseDualStack": false + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.cn-northwest-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "UseFIPS": true, + "Region": "cn-northwest-1", + "UseDualStack": true + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.cn-northwest-1.amazonaws.com.cn" + } + }, + "params": { + "UseFIPS": true, + "Region": "cn-northwest-1", + "UseDualStack": false + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://license-manager.cn-northwest-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "UseFIPS": false, + "Region": "cn-northwest-1", + "UseDualStack": true + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.cn-northwest-1.amazonaws.com.cn" + } + }, + "params": { + "UseFIPS": false, + "Region": "cn-northwest-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "error": "FIPS and DualStack are enabled, but this partition does not support one or both" + }, + "params": { + "UseFIPS": true, + "Region": "us-isob-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager-fips.us-isob-east-1.sc2s.sgov.gov" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-isob-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "error": "DualStack is enabled but this partition does not support DualStack" + }, + "params": { + "UseFIPS": false, + "Region": "us-isob-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-isob-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://license-manager.us-isob-east-1.sc2s.sgov.gov" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-isob-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips enabled and dualstack disabled", + "expect": { + "error": "Invalid Configuration: FIPS and custom endpoint are not supported" + }, + "params": { + "UseFIPS": true, + "Region": "us-east-1", + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack enabled", + "expect": { + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": true, + "Endpoint": "https://example.com" + } + } + ], + "version": "1.0" +} \ No newline at end of file diff --git a/models/apis/marketplace-catalog/2018-09-17/api-2.json b/models/apis/marketplace-catalog/2018-09-17/api-2.json index c61401dc9e2..4ff5f61a67a 100644 --- a/models/apis/marketplace-catalog/2018-09-17/api-2.json +++ b/models/apis/marketplace-catalog/2018-09-17/api-2.json @@ -94,6 +94,22 @@ {"shape":"ThrottlingException"} ] }, + "ListTagsForResource":{ + "name":"ListTagsForResource", + "http":{ + "method":"POST", + "requestUri":"/ListTagsForResource" + }, + "input":{"shape":"ListTagsForResourceRequest"}, + "output":{"shape":"ListTagsForResourceResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"InternalServiceException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"ThrottlingException"} + ] + }, "StartChangeSet":{ "name":"StartChangeSet", "http":{ @@ -111,6 +127,38 @@ {"shape":"ThrottlingException"}, {"shape":"ServiceQuotaExceededException"} ] + }, + "TagResource":{ + "name":"TagResource", + "http":{ + "method":"POST", + "requestUri":"/TagResource" + }, + "input":{"shape":"TagResourceRequest"}, + "output":{"shape":"TagResourceResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"InternalServiceException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"ThrottlingException"} + ] + }, + "UntagResource":{ + "name":"UntagResource", + "http":{ + "method":"POST", + "requestUri":"/UntagResource" + }, + "input":{"shape":"UntagResourceRequest"}, + "output":{"shape":"UntagResourceResponse"}, + "errors":[ + {"shape":"ResourceNotFoundException"}, + {"shape":"InternalServiceException"}, + {"shape":"AccessDeniedException"}, + {"shape":"ValidationException"}, + {"shape":"ThrottlingException"} + ] } }, "shapes":{ @@ -171,6 +219,7 @@ "members":{ "ChangeType":{"shape":"ChangeType"}, "Entity":{"shape":"Entity"}, + "EntityTags":{"shape":"TagList"}, "Details":{"shape":"Json"}, "ChangeName":{"shape":"ChangeName"} } @@ -236,9 +285,9 @@ }, "ClientRequestToken":{ "type":"string", - "max":36, + "max":64, "min":1, - "pattern":"^[\\w\\-]+$" + "pattern":"^[!-~]+$" }, "DateTimeISO8601":{ "type":"string", @@ -459,6 +508,20 @@ "NextToken":{"shape":"NextToken"} } }, + "ListTagsForResourceRequest":{ + "type":"structure", + "required":["ResourceArn"], + "members":{ + "ResourceArn":{"shape":"ResourceARN"} + } + }, + "ListTagsForResourceResponse":{ + "type":"structure", + "members":{ + "ResourceArn":{"shape":"ResourceARN"}, + "Tags":{"shape":"TagList"} + } + }, "MaxResultInteger":{ "type":"integer", "box":true, @@ -477,6 +540,12 @@ "max":20, "min":1 }, + "ResourceARN":{ + "type":"string", + "max":255, + "min":1, + "pattern":"^arn:[\\w+=/,.@-]+:aws-marketplace:[\\w+=/,.@-]*:[0-9]+:[\\w+=,.@-]+(/[\\w+=,.@-]+)*$" + }, "ResourceId":{ "type":"string", "max":255, @@ -556,7 +625,8 @@ "ClientRequestToken":{ "shape":"ClientRequestToken", "idempotencyToken":true - } + }, + "ChangeSetTags":{"shape":"TagList"} } }, "StartChangeSetResponse":{ @@ -566,6 +636,57 @@ "ChangeSetArn":{"shape":"ARN"} } }, + "Tag":{ + "type":"structure", + "required":[ + "Key", + "Value" + ], + "members":{ + "Key":{"shape":"TagKey"}, + "Value":{"shape":"TagValue"} + } + }, + "TagKey":{ + "type":"string", + "max":128, + "min":1, + "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$" + }, + "TagKeyList":{ + "type":"list", + "member":{"shape":"TagKey"}, + "max":50, + "min":1 + }, + "TagList":{ + "type":"list", + "member":{"shape":"Tag"}, + "max":50, + "min":1 + }, + "TagResourceRequest":{ + "type":"structure", + "required":[ + "ResourceArn", + "Tags" + ], + "members":{ + "ResourceArn":{"shape":"ResourceARN"}, + "Tags":{"shape":"TagList"} + } + }, + "TagResourceResponse":{ + "type":"structure", + "members":{ + } + }, + "TagValue":{ + "type":"string", + "max":256, + "min":0, + "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$" + }, "ThrottlingException":{ "type":"structure", "members":{ @@ -575,6 +696,22 @@ "exception":true, "synthetic":true }, + "UntagResourceRequest":{ + "type":"structure", + "required":[ + "ResourceArn", + "TagKeys" + ], + "members":{ + "ResourceArn":{"shape":"ResourceARN"}, + "TagKeys":{"shape":"TagKeyList"} + } + }, + "UntagResourceResponse":{ + "type":"structure", + "members":{ + } + }, "ValidationException":{ "type":"structure", "members":{ diff --git a/models/apis/marketplace-catalog/2018-09-17/docs-2.json b/models/apis/marketplace-catalog/2018-09-17/docs-2.json index 49094b7c102..4fe2197200f 100644 --- a/models/apis/marketplace-catalog/2018-09-17/docs-2.json +++ b/models/apis/marketplace-catalog/2018-09-17/docs-2.json @@ -7,7 +7,10 @@ "DescribeEntity": "

Returns the metadata and content of the entity.

", "ListChangeSets": "

Returns the list of change sets owned by the account being used to make the call. You can filter this list by providing any combination of entityId, ChangeSetName, and status. If you provide more than one filter, the API operation applies a logical AND between the filters.

You can describe a change during the 60-day request history retention period for API calls.

", "ListEntities": "

Provides the list of entities of a given type.

", - "StartChangeSet": "

This operation allows you to request changes for your entities. Within a single ChangeSet, you cannot start the same change type against the same entity multiple times. Additionally, when a ChangeSet is running, all the entities targeted by the different changes are locked until the ChangeSet has completed (either succeeded, cancelled, or failed). If you try to start a ChangeSet containing a change against an entity that is already locked, you will receive a ResourceInUseException.

For example, you cannot start the ChangeSet described in the example later in this topic, because it contains two changes to execute the same change type (AddRevisions) against the same entity (entity-id@1).

For more information about working with change sets, see Working with change sets.

" + "ListTagsForResource": "

Lists all tags that have been added to a resource (either an entity or change set).

", + "StartChangeSet": "

Allows you to request changes for your entities. Within a single ChangeSet, you can't start the same change type against the same entity multiple times. Additionally, when a ChangeSet is running, all the entities targeted by the different changes are locked until the change set has completed (either succeeded, cancelled, or failed). If you try to start a change set containing a change against an entity that is already locked, you will receive a ResourceInUseException error.

For example, you can't start the ChangeSet described in the example later in this topic because it contains two changes to run the same change type (AddRevisions) against the same entity (entity-id@1).

For more information about working with change sets, see Working with change sets.

", + "TagResource": "

Tags a resource (either an entity or change set).

", + "UntagResource": "

Removes a tag or list of tags from a resource (either an entity or change set).

" }, "shapes": { "ARN": { @@ -282,6 +285,16 @@ "refs": { } }, + "ListTagsForResourceRequest": { + "base": null, + "refs": { + } + }, + "ListTagsForResourceResponse": { + "base": null, + "refs": { + } + }, "MaxResultInteger": { "base": null, "refs": { @@ -304,6 +317,15 @@ "StartChangeSetRequest$ChangeSet": "

Array of change object.

" } }, + "ResourceARN": { + "base": null, + "refs": { + "ListTagsForResourceRequest$ResourceArn": "

Required. The Amazon Resource Name (ARN) associated with the resource you want to list tags on.

", + "ListTagsForResourceResponse$ResourceArn": "

Required. The ARN associated with the resource you want to list tags on.

", + "TagResourceRequest$ResourceArn": "

Required. The Amazon Resource Name (ARN) associated with the resource you want to tag.

", + "UntagResourceRequest$ResourceArn": "

Required. The Amazon Resource Name (ARN) associated with the resource you want to remove the tag from.

" + } + }, "ResourceId": { "base": null, "refs": { @@ -373,11 +395,65 @@ "refs": { } }, + "Tag": { + "base": "

A list of objects specifying each key name and value.

", + "refs": { + "TagList$member": null + } + }, + "TagKey": { + "base": null, + "refs": { + "Tag$Key": "

The key associated with the tag.

", + "TagKeyList$member": null + } + }, + "TagKeyList": { + "base": null, + "refs": { + "UntagResourceRequest$TagKeys": "

Required. A list of key names of tags to be removed. Number of strings allowed: 0-256.

" + } + }, + "TagList": { + "base": null, + "refs": { + "Change$EntityTags": "

The tags associated with the change.

", + "ListTagsForResourceResponse$Tags": "

Required. A list of objects specifying each key name and value. Number of objects allowed: 1-50.

", + "StartChangeSetRequest$ChangeSetTags": "

A list of objects specifying each key name and value for the ChangeSetTags property.

", + "TagResourceRequest$Tags": "

Required. A list of objects specifying each key name and value. Number of objects allowed: 1-50.

" + } + }, + "TagResourceRequest": { + "base": null, + "refs": { + } + }, + "TagResourceResponse": { + "base": null, + "refs": { + } + }, + "TagValue": { + "base": null, + "refs": { + "Tag$Value": "

The value associated with the tag.

" + } + }, "ThrottlingException": { "base": "

Too many requests.

", "refs": { } }, + "UntagResourceRequest": { + "base": null, + "refs": { + } + }, + "UntagResourceResponse": { + "base": null, + "refs": { + } + }, "ValidationException": { "base": "

An error occurred during validation.

", "refs": { diff --git a/models/apis/marketplace-catalog/2018-09-17/endpoint-rule-set-1.json b/models/apis/marketplace-catalog/2018-09-17/endpoint-rule-set-1.json new file mode 100644 index 00000000000..c7dcb3cfc45 --- /dev/null +++ b/models/apis/marketplace-catalog/2018-09-17/endpoint-rule-set-1.json @@ -0,0 +1,315 @@ +{ + "version": "1.0", + "parameters": { + "Region": { + "builtIn": "AWS::Region", + "required": false, + "documentation": "The AWS region used to dispatch the request.", + "type": "String" + }, + "UseDualStack": { + "builtIn": "AWS::UseDualStack", + "required": true, + "default": false, + "documentation": "When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.", + "type": "Boolean" + }, + "UseFIPS": { + "builtIn": "AWS::UseFIPS", + "required": true, + "default": false, + "documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.", + "type": "Boolean" + }, + "Endpoint": { + "builtIn": "SDK::Endpoint", + "required": false, + "documentation": "Override the endpoint used to send this request", + "type": "String" + } + }, + "rules": [ + { + "conditions": [ + { + "fn": "aws.partition", + "argv": [ + { + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Endpoint" + } + ] + }, + { + "fn": "parseURL", + "argv": [ + { + "ref": "Endpoint" + } + ], + "assign": "url" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://catalog.marketplace-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://catalog.marketplace-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://catalog.marketplace.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" + } + ] + }, + { + "conditions": [], + "endpoint": { + "url": "https://catalog.marketplace.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] +} \ No newline at end of file diff --git a/models/apis/marketplace-catalog/2018-09-17/endpoint-tests-1.json b/models/apis/marketplace-catalog/2018-09-17/endpoint-tests-1.json new file mode 100644 index 00000000000..0dd9c2795e8 --- /dev/null +++ b/models/apis/marketplace-catalog/2018-09-17/endpoint-tests-1.json @@ -0,0 +1,147 @@ +{ + "testCases": [ + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://catalog.marketplace-fips.us-west-2.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-west-2", + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://catalog.marketplace-fips.us-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-west-2", + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://catalog.marketplace.us-west-2.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-west-2", + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://catalog.marketplace.us-west-2.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-west-2", + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://catalog.marketplace-fips.us-east-1.api.aws" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://catalog.marketplace-fips.us-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": true, + "Region": "us-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://catalog.marketplace.us-east-1.api.aws" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://catalog.marketplace.us-east-1.amazonaws.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": false + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips enabled and dualstack disabled", + "expect": { + "error": "Invalid Configuration: FIPS and custom endpoint are not supported" + }, + "params": { + "UseFIPS": true, + "Region": "us-east-1", + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack enabled", + "expect": { + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" + }, + "params": { + "UseFIPS": false, + "Region": "us-east-1", + "UseDualStack": true, + "Endpoint": "https://example.com" + } + } + ], + "version": "1.0" +} \ No newline at end of file diff --git a/models/apis/rekognition/2016-06-27/api-2.json b/models/apis/rekognition/2016-06-27/api-2.json index 87a521f3cd3..b17e20b3775 100644 --- a/models/apis/rekognition/2016-06-27/api-2.json +++ b/models/apis/rekognition/2016-06-27/api-2.json @@ -1953,13 +1953,70 @@ "OrientationCorrection":{"shape":"OrientationCorrection"} } }, + "DetectLabelsFeatureList":{ + "type":"list", + "member":{"shape":"DetectLabelsFeatureName"}, + "max":2, + "min":0 + }, + "DetectLabelsFeatureName":{ + "type":"string", + "enum":[ + "GENERAL_LABELS", + "IMAGE_PROPERTIES" + ] + }, + "DetectLabelsImageBackground":{ + "type":"structure", + "members":{ + "Quality":{"shape":"DetectLabelsImageQuality"}, + "DominantColors":{"shape":"DominantColors"} + } + }, + "DetectLabelsImageForeground":{ + "type":"structure", + "members":{ + "Quality":{"shape":"DetectLabelsImageQuality"}, + "DominantColors":{"shape":"DominantColors"} + } + }, + "DetectLabelsImageProperties":{ + "type":"structure", + "members":{ + "Quality":{"shape":"DetectLabelsImageQuality"}, + "DominantColors":{"shape":"DominantColors"}, + "Foreground":{"shape":"DetectLabelsImageForeground"}, + "Background":{"shape":"DetectLabelsImageBackground"} + } + }, + "DetectLabelsImagePropertiesSettings":{ + "type":"structure", + "members":{ + "MaxDominantColors":{"shape":"DetectLabelsMaxDominantColors"} + } + }, + "DetectLabelsImageQuality":{ + "type":"structure", + "members":{ + "Brightness":{"shape":"Float"}, + "Sharpness":{"shape":"Float"}, + "Contrast":{"shape":"Float"} + } + }, + "DetectLabelsMaxDominantColors":{ + "type":"integer", + "max":20, + "min":0 + }, "DetectLabelsRequest":{ "type":"structure", "required":["Image"], "members":{ "Image":{"shape":"Image"}, "MaxLabels":{"shape":"UInteger"}, - "MinConfidence":{"shape":"Percent"} + "MinConfidence":{"shape":"Percent"}, + "Features":{"shape":"DetectLabelsFeatureList"}, + "Settings":{"shape":"DetectLabelsSettings"} } }, "DetectLabelsResponse":{ @@ -1967,7 +2024,15 @@ "members":{ "Labels":{"shape":"Labels"}, "OrientationCorrection":{"shape":"OrientationCorrection"}, - "LabelModelVersion":{"shape":"String"} + "LabelModelVersion":{"shape":"String"}, + "ImageProperties":{"shape":"DetectLabelsImageProperties"} + } + }, + "DetectLabelsSettings":{ + "type":"structure", + "members":{ + "GeneralLabels":{"shape":"GeneralLabelsSettings"}, + "ImageProperties":{"shape":"DetectLabelsImagePropertiesSettings"} } }, "DetectModerationLabelsRequest":{ @@ -2058,6 +2123,22 @@ "max":2, "min":2 }, + "DominantColor":{ + "type":"structure", + "members":{ + "Red":{"shape":"UInteger"}, + "Blue":{"shape":"UInteger"}, + "Green":{"shape":"UInteger"}, + "HexCode":{"shape":"String"}, + "CSSColor":{"shape":"String"}, + "SimplifiedColor":{"shape":"String"}, + "PixelPercent":{"shape":"Percent"} + } + }, + "DominantColors":{ + "type":"list", + "member":{"shape":"DominantColor"} + }, "Emotion":{ "type":"structure", "members":{ @@ -2253,6 +2334,27 @@ "Female" ] }, + "GeneralLabelsFilterList":{ + "type":"list", + "member":{"shape":"GeneralLabelsFilterValue"}, + "max":100, + "min":0 + }, + "GeneralLabelsFilterValue":{ + "type":"string", + "max":50, + "min":0, + "pattern":"[A-Za-z0-9àâèçñó'-_(). ]*" + }, + "GeneralLabelsSettings":{ + "type":"structure", + "members":{ + "LabelInclusionFilters":{"shape":"GeneralLabelsFilterList"}, + "LabelExclusionFilters":{"shape":"GeneralLabelsFilterList"}, + "LabelCategoryInclusionFilters":{"shape":"GeneralLabelsFilterList"}, + "LabelCategoryExclusionFilters":{"shape":"GeneralLabelsFilterList"} + } + }, "Geometry":{ "type":"structure", "members":{ @@ -2578,7 +2680,8 @@ "type":"structure", "members":{ "BoundingBox":{"shape":"BoundingBox"}, - "Confidence":{"shape":"Percent"} + "Confidence":{"shape":"Percent"}, + "DominantColors":{"shape":"DominantColors"} } }, "Instances":{ @@ -2695,7 +2798,29 @@ "Name":{"shape":"String"}, "Confidence":{"shape":"Percent"}, "Instances":{"shape":"Instances"}, - "Parents":{"shape":"Parents"} + "Parents":{"shape":"Parents"}, + "Aliases":{"shape":"LabelAliases"}, + "Categories":{"shape":"LabelCategories"} + } + }, + "LabelAlias":{ + "type":"structure", + "members":{ + "Name":{"shape":"String"} + } + }, + "LabelAliases":{ + "type":"list", + "member":{"shape":"LabelAlias"} + }, + "LabelCategories":{ + "type":"list", + "member":{"shape":"LabelCategory"} + }, + "LabelCategory":{ + "type":"structure", + "members":{ + "Name":{"shape":"String"} } }, "LabelDetection":{ diff --git a/models/apis/rekognition/2016-06-27/docs-2.json b/models/apis/rekognition/2016-06-27/docs-2.json index 6e538ac5bd7..baf23a495b0 100644 --- a/models/apis/rekognition/2016-06-27/docs-2.json +++ b/models/apis/rekognition/2016-06-27/docs-2.json @@ -23,7 +23,7 @@ "DescribeStreamProcessor": "

Provides information about a stream processor created by CreateStreamProcessor. You can get information about the input and output streams, the input parameters for the face recognition being performed, and the current status of the stream processor.

", "DetectCustomLabels": "

Detects custom labels in a supplied image by using an Amazon Rekognition Custom Labels model.

You specify which version of a model version to use by using the ProjectVersionArn input parameter.

You pass the input image as base64-encoded image bytes or as a reference to an image in an Amazon S3 bucket. If you use the AWS CLI to call Amazon Rekognition operations, passing image bytes is not supported. The image must be either a PNG or JPEG formatted file.

For each object that the model version detects on an image, the API returns a (CustomLabel) object in an array (CustomLabels). Each CustomLabel object provides the label name (Name), the level of confidence that the image contains the object (Confidence), and object location information, if it exists, for the label on the image (Geometry).

To filter labels that are returned, specify a value for MinConfidence. DetectCustomLabelsLabels only returns labels with a confidence that's higher than the specified value. The value of MinConfidence maps to the assumed threshold values created during training. For more information, see Assumed threshold in the Amazon Rekognition Custom Labels Developer Guide. Amazon Rekognition Custom Labels metrics expresses an assumed threshold as a floating point value between 0-1. The range of MinConfidence normalizes the threshold value to a percentage value (0-100). Confidence responses from DetectCustomLabels are also returned as a percentage. You can use MinConfidence to change the precision and recall or your model. For more information, see Analyzing an image in the Amazon Rekognition Custom Labels Developer Guide.

If you don't specify a value for MinConfidence, DetectCustomLabels returns labels based on the assumed threshold of each label.

This is a stateless API operation. That is, the operation does not persist any data.

This operation requires permissions to perform the rekognition:DetectCustomLabels action.

For more information, see Analyzing an image in the Amazon Rekognition Custom Labels Developer Guide.

", "DetectFaces": "

Detects faces within an image that is provided as input.

DetectFaces detects the 100 largest faces in the image. For each face detected, the operation returns face details. These details include a bounding box of the face, a confidence value (that the bounding box contains a face), and a fixed set of attributes such as facial landmarks (for example, coordinates of eye and mouth), presence of beard, sunglasses, and so on.

The face-detection algorithm is most effective on frontal faces. For non-frontal or obscured faces, the algorithm might not detect the faces or might detect faces with lower confidence.

You pass the input image either as base64-encoded image bytes or as a reference to an image in an Amazon S3 bucket. If you use the AWS CLI to call Amazon Rekognition operations, passing image bytes is not supported. The image must be either a PNG or JPEG formatted file.

This is a stateless API operation. That is, the operation does not persist any data.

This operation requires permissions to perform the rekognition:DetectFaces action.

", - "DetectLabels": "

Detects instances of real-world entities within an image (JPEG or PNG) provided as input. This includes objects like flower, tree, and table; events like wedding, graduation, and birthday party; and concepts like landscape, evening, and nature.

For an example, see Analyzing images stored in an Amazon S3 bucket in the Amazon Rekognition Developer Guide.

DetectLabels does not support the detection of activities. However, activity detection is supported for label detection in videos. For more information, see StartLabelDetection in the Amazon Rekognition Developer Guide.

You pass the input image as base64-encoded image bytes or as a reference to an image in an Amazon S3 bucket. If you use the AWS CLI to call Amazon Rekognition operations, passing image bytes is not supported. The image must be either a PNG or JPEG formatted file.

For each object, scene, and concept the API returns one or more labels. Each label provides the object name, and the level of confidence that the image contains the object. For example, suppose the input image has a lighthouse, the sea, and a rock. The response includes all three labels, one for each object.

{Name: lighthouse, Confidence: 98.4629}

{Name: rock,Confidence: 79.2097}

{Name: sea,Confidence: 75.061}

In the preceding example, the operation returns one label for each of the three objects. The operation can also return multiple labels for the same object in the image. For example, if the input image shows a flower (for example, a tulip), the operation might return the following three labels.

{Name: flower,Confidence: 99.0562}

{Name: plant,Confidence: 99.0562}

{Name: tulip,Confidence: 99.0562}

In this example, the detection algorithm more precisely identifies the flower as a tulip.

In response, the API returns an array of labels. In addition, the response also includes the orientation correction. Optionally, you can specify MinConfidence to control the confidence threshold for the labels returned. The default is 55%. You can also add the MaxLabels parameter to limit the number of labels returned.

If the object detected is a person, the operation doesn't provide the same facial details that the DetectFaces operation provides.

DetectLabels returns bounding boxes for instances of common object labels in an array of Instance objects. An Instance object contains a BoundingBox object, for the location of the label on the image. It also includes the confidence by which the bounding box was detected.

DetectLabels also returns a hierarchical taxonomy of detected labels. For example, a detected car might be assigned the label car. The label car has two parent labels: Vehicle (its parent) and Transportation (its grandparent). The response returns the entire list of ancestors for a label. Each ancestor is a unique label in the response. In the previous example, Car, Vehicle, and Transportation are returned as unique labels in the response.

This is a stateless API operation. That is, the operation does not persist any data.

This operation requires permissions to perform the rekognition:DetectLabels action.

", + "DetectLabels": "

Detects instances of real-world entities within an image (JPEG or PNG) provided as input. This includes objects like flower, tree, and table; events like wedding, graduation, and birthday party; and concepts like landscape, evening, and nature.

For an example, see Analyzing images stored in an Amazon S3 bucket in the Amazon Rekognition Developer Guide.

You pass the input image as base64-encoded image bytes or as a reference to an image in an Amazon S3 bucket. If you use the AWS CLI to call Amazon Rekognition operations, passing image bytes is not supported. The image must be either a PNG or JPEG formatted file.

Optional Parameters

You can specify one or both of the GENERAL_LABELS and IMAGE_PROPERTIES feature types when calling the DetectLabels API. Including GENERAL_LABELS will ensure the response includes the labels detected in the input image, while including IMAGE_PROPERTIES will ensure the response includes information about the image quality and color.

When using GENERAL_LABELS and/or IMAGE_PROPERTIES you can provide filtering criteria to the Settings parameter. You can filter with sets of individual labels or with label categories. You can specify inclusive filters, exclusive filters, or a combination of inclusive and exclusive filters. For more information on filtering see Detecting Labels in an Image.

You can specify MinConfidence to control the confidence threshold for the labels returned. The default is 55%. You can also add the MaxLabels parameter to limit the number of labels returned. The default and upper limit is 1000 labels.

Response Elements

For each object, scene, and concept the API returns one or more labels. The API returns the following types of information regarding labels:

The API returns the following information regarding the image, as part of the ImageProperties structure:

The list of returned labels will include at least one label for every detected object, along with information about that label. In the following example, suppose the input image has a lighthouse, the sea, and a rock. The response includes all three labels, one for each object, as well as the confidence in the label:

{Name: lighthouse, Confidence: 98.4629}

{Name: rock,Confidence: 79.2097}

{Name: sea,Confidence: 75.061}

The list of labels can include multiple labels for the same object. For example, if the input image shows a flower (for example, a tulip), the operation might return the following three labels.

{Name: flower,Confidence: 99.0562}

{Name: plant,Confidence: 99.0562}

{Name: tulip,Confidence: 99.0562}

In this example, the detection algorithm more precisely identifies the flower as a tulip.

If the object detected is a person, the operation doesn't provide the same facial details that the DetectFaces operation provides.

This is a stateless API operation. That is, the operation does not persist any data.

This operation requires permissions to perform the rekognition:DetectLabels action.

", "DetectModerationLabels": "

Detects unsafe content in a specified JPEG or PNG format image. Use DetectModerationLabels to moderate images depending on your requirements. For example, you might want to filter images that contain nudity, but not images containing suggestive content.

To filter images, use the labels returned by DetectModerationLabels to determine which types of content are appropriate.

For information about moderation labels, see Detecting Unsafe Content in the Amazon Rekognition Developer Guide.

You pass the input image either as base64-encoded image bytes or as a reference to an image in an Amazon S3 bucket. If you use the AWS CLI to call Amazon Rekognition operations, passing image bytes is not supported. The image must be either a PNG or JPEG formatted file.

", "DetectProtectiveEquipment": "

Detects Personal Protective Equipment (PPE) worn by people detected in an image. Amazon Rekognition can detect the following types of PPE.

You pass the input image as base64-encoded image bytes or as a reference to an image in an Amazon S3 bucket. The image must be either a PNG or JPG formatted file.

DetectProtectiveEquipment detects PPE worn by up to 15 persons detected in an image.

For each person detected in the image the API returns an array of body parts (face, head, left-hand, right-hand). For each body part, an array of detected items of PPE is returned, including an indicator of whether or not the PPE covers the body part. The API returns the confidence it has in each detection (person, PPE, body part and body part coverage). It also returns a bounding box (BoundingBox) for each detected person and each detected item of PPE.

You can optionally request a summary of detected PPE items with the SummarizationAttributes input parameter. The summary provides the following information.

This is a stateless API operation. That is, the operation does not persist any data.

This operation requires permissions to perform the rekognition:DetectProtectiveEquipment action.

", "DetectText": "

Detects text in the input image and converts it into machine-readable text.

Pass the input image as base64-encoded image bytes or as a reference to an image in an Amazon S3 bucket. If you use the AWS CLI to call Amazon Rekognition operations, you must pass it as a reference to an image in an Amazon S3 bucket. For the AWS CLI, passing image bytes is not supported. The image must be either a .png or .jpeg formatted file.

The DetectText operation returns text in an array of TextDetection elements, TextDetections. Each TextDetection element provides information about a single word or line of text that was detected in the image.

A word is one or more script characters that are not separated by spaces. DetectText can detect up to 100 words in an image.

A line is a string of equally spaced words. A line isn't necessarily a complete sentence. For example, a driver's license number is detected as a line. A line ends when there is no aligned text after it. Also, a line ends when there is a large gap between words, relative to the length of the words. This means, depending on the gap between words, Amazon Rekognition may detect multiple lines in text aligned in the same direction. Periods don't represent the end of a line. If a sentence spans multiple lines, the DetectText operation returns multiple lines.

To determine whether a TextDetection element is a line of text or a word, use the TextDetection object Type field.

To be detected, text must be within +/- 90 degrees orientation of the horizontal axis.

For more information, see Detecting text in the Amazon Rekognition Developer Guide.

", @@ -716,6 +716,56 @@ "refs": { } }, + "DetectLabelsFeatureList": { + "base": null, + "refs": { + "DetectLabelsRequest$Features": "

A list of the types of analysis to perform. Specifying GENERAL_LABELS uses the label detection feature, while specifying IMAGE_PROPERTIES returns information regarding image color and quality. If no option is specified GENERAL_LABELS is used by default.

" + } + }, + "DetectLabelsFeatureName": { + "base": null, + "refs": { + "DetectLabelsFeatureList$member": null + } + }, + "DetectLabelsImageBackground": { + "base": "

The background of the image with regard to image quality and dominant colors.

", + "refs": { + "DetectLabelsImageProperties$Background": "

Information about the properties of an image’s background, including the background’s quality and dominant colors, including the quality and dominant colors of the image.

" + } + }, + "DetectLabelsImageForeground": { + "base": "

The foreground of the image with regard to image quality and dominant colors.

", + "refs": { + "DetectLabelsImageProperties$Foreground": "

Information about the properties of an image’s foreground, including the foreground’s quality and dominant colors, including the quality and dominant colors of the image.

" + } + }, + "DetectLabelsImageProperties": { + "base": "

Information about the quality and dominant colors of an input image. Quality and color information is returned for the entire image, foreground, and background.

", + "refs": { + "DetectLabelsResponse$ImageProperties": "

Information about the properties of the input image, such as brightness, sharpness, contrast, and dominant colors.

" + } + }, + "DetectLabelsImagePropertiesSettings": { + "base": "

Settings for the IMAGE_PROPERTIES feature type.

", + "refs": { + "DetectLabelsSettings$ImageProperties": "

Contains the chosen number of maximum dominant colors in an image.

" + } + }, + "DetectLabelsImageQuality": { + "base": "

The quality of an image provided for label detection, with regard to brightness, sharpness, and contrast.

", + "refs": { + "DetectLabelsImageBackground$Quality": "

The quality of the image background as defined by brightness and sharpness.

", + "DetectLabelsImageForeground$Quality": "

The quality of the image foreground as defined by brightness and sharpness.

", + "DetectLabelsImageProperties$Quality": "

Information about the quality of the image foreground as defined by brightness, sharpness, and contrast. The higher the value the greater the brightness, sharpness, and contrast respectively.

" + } + }, + "DetectLabelsMaxDominantColors": { + "base": null, + "refs": { + "DetectLabelsImagePropertiesSettings$MaxDominantColors": "

The maximum number of dominant colors to return when detecting labels in an image. The default value is 10.

" + } + }, "DetectLabelsRequest": { "base": null, "refs": { @@ -726,6 +776,12 @@ "refs": { } }, + "DetectLabelsSettings": { + "base": "

Settings for the DetectLabels request. Settings can include filters for both GENERAL_LABELS and IMAGE_PROPERTIES. GENERAL_LABELS filters can be inclusive or exclusive and applied to individual labels or label categories. IMAGE_PROPERTIES filters allow specification of a maximum number of dominant colors.

", + "refs": { + "DetectLabelsRequest$Settings": "

A list of the filters to be applied to returned detected labels and image properties. Specified filters can be inclusive, exclusive, or a combination of both. Filters can be used for individual labels or label categories. The exact label names or label categories must be supplied. For a full list of labels and label categories, see LINK HERE.

" + } + }, "DetectModerationLabelsRequest": { "base": null, "refs": { @@ -791,6 +847,21 @@ "DistributeDatasetEntriesRequest$Datasets": "

The ARNS for the training dataset and test dataset that you want to use. The datasets must belong to the same project. The test dataset must be empty.

" } }, + "DominantColor": { + "base": "

A description of the dominant colors in an image.

", + "refs": { + "DominantColors$member": null + } + }, + "DominantColors": { + "base": null, + "refs": { + "DetectLabelsImageBackground$DominantColors": "

The dominant colors found in the background of an image, defined with RGB values, CSS color name, simplified color name, and PixelPercentage (the percentage of image pixels that have a particular color).

", + "DetectLabelsImageForeground$DominantColors": "

The dominant colors found in the foreground of an image, defined with RGB values, CSS color name, simplified color name, and PixelPercentage (the percentage of image pixels that have a particular color).

", + "DetectLabelsImageProperties$DominantColors": "

Information about the dominant colors found in an image, described with RGB values, CSS color name, simplified color name, and PixelPercentage (the percentage of image pixels that have a particular color).

", + "Instance$DominantColors": "

The dominant colors found in an individual instance of a label.

" + } + }, "Emotion": { "base": "

The emotions that appear to be expressed on the face, and the confidence level in the determination. The API is only making a determination of the physical appearance of a person's face. It is not a determination of the person’s internal emotional state and should not be used in such a way. For example, a person pretending to have a sad face might not be sad emotionally.

", "refs": { @@ -978,6 +1049,9 @@ "BoundingBox$Height": "

Height of the bounding box as a ratio of the overall image height.

", "BoundingBox$Left": "

Left coordinate of the bounding box as a ratio of overall image width.

", "BoundingBox$Top": "

Top coordinate of the bounding box as a ratio of overall image height.

", + "DetectLabelsImageQuality$Brightness": "

The brightness of an image provided for label detection.

", + "DetectLabelsImageQuality$Sharpness": "

The sharpness of an image provided for label detection.

", + "DetectLabelsImageQuality$Contrast": "

The contrast of an image provided for label detection.

", "EvaluationResult$F1Score": "

The F1 score for the evaluation of all labels. The F1 score metric evaluates the overall precision and recall performance of the model as a single value. A higher value indicates better precision and recall performance. A lower score indicates that precision, recall, or both are performing poorly.

", "ImageQuality$Brightness": "

Value representing brightness of the face. The service returns a value between 0 and 100 (inclusive). A higher value indicates a brighter face image.

", "ImageQuality$Sharpness": "

Value representing sharpness of the face. The service returns a value between 0 and 100 (inclusive). A higher value indicates a sharper face image.

", @@ -1006,6 +1080,27 @@ "Gender$Value": "

The predicted gender of the face.

" } }, + "GeneralLabelsFilterList": { + "base": null, + "refs": { + "GeneralLabelsSettings$LabelInclusionFilters": "

The labels that should be included in the return from DetectLabels.

", + "GeneralLabelsSettings$LabelExclusionFilters": "

The labels that should be excluded from the return from DetectLabels.

", + "GeneralLabelsSettings$LabelCategoryInclusionFilters": "

The label categories that should be included in the return from DetectLabels.

", + "GeneralLabelsSettings$LabelCategoryExclusionFilters": "

The label categories that should be excluded from the return from DetectLabels.

" + } + }, + "GeneralLabelsFilterValue": { + "base": null, + "refs": { + "GeneralLabelsFilterList$member": null + } + }, + "GeneralLabelsSettings": { + "base": "

Contains filters for the object labels returned by DetectLabels. Filters can be inclusive, exclusive, or a combination of both and can be applied to individual l abels or entire label categories.

", + "refs": { + "DetectLabelsSettings$GeneralLabels": "

Contains the specified filters for GENERAL_LABELS.

" + } + }, "Geometry": { "base": "

Information about where an object (DetectCustomLabels) or text (DetectText) is located on an image.

", "refs": { @@ -1359,9 +1454,9 @@ } }, "KinesisVideoStreamStartSelector": { - "base": "

Specifies the starting point in a Kinesis stream to start processing. You can use the producer timestamp or the fragment number. For more information, see Fragment.

", + "base": "

Specifies the starting point in a Kinesis stream to start processing. You can use the producer timestamp or the fragment number. One of either producer timestamp or fragment number is required. If you use the producer timestamp, you must put the time in milliseconds. For more information about fragment numbers, see Fragment.

", "refs": { - "StreamProcessingStartSelector$KVSStreamStartSelector": "

Specifies the starting point in the stream to start processing. This can be done with a timestamp or a fragment number in a Kinesis stream.

" + "StreamProcessingStartSelector$KVSStreamStartSelector": "

Specifies the starting point in the stream to start processing. This can be done with a producer timestamp or a fragment number in a Kinesis stream.

" } }, "KmsKeyId": { @@ -1395,6 +1490,30 @@ "Labels$member": null } }, + "LabelAlias": { + "base": "

A potential alias of for a given label.

", + "refs": { + "LabelAliases$member": null + } + }, + "LabelAliases": { + "base": null, + "refs": { + "Label$Aliases": "

A list of potential aliases for a given label.

" + } + }, + "LabelCategories": { + "base": null, + "refs": { + "Label$Categories": "

A list of the categories associated with a given label.

" + } + }, + "LabelCategory": { + "base": "

The category that applies to a given label.

", + "refs": { + "LabelCategories$member": null + } + }, "LabelDetection": { "base": "

Information about a label detected in a video analysis request and the time the label was detected in the video.

", "refs": { @@ -1701,6 +1820,7 @@ "DetectLabelsRequest$MinConfidence": "

Specifies the minimum confidence level for the labels to return. Amazon Rekognition doesn't return any labels with confidence lower than this specified value.

If MinConfidence is not specified, the operation returns labels with a confidence values greater than or equal to 55 percent.

", "DetectModerationLabelsRequest$MinConfidence": "

Specifies the minimum confidence level for the labels to return. Amazon Rekognition doesn't return any labels with a confidence level lower than this specified value.

If you don't specify MinConfidence, the operation returns labels with confidence values greater than or equal to 50 percent.

", "DetectionFilter$MinConfidence": "

Sets the confidence of word detection. Words with detection confidence below this will be excluded from the result. Values should be between 0 and 100. The default MinConfidence is 80.

", + "DominantColor$PixelPercent": "

The percentage of image pixels that have a given dominant color.

", "Emotion$Confidence": "

Level of confidence in the determination.

", "EquipmentDetection$Confidence": "

The confidence that Amazon Rekognition has that the bounding box (BoundingBox) contains an item of PPE.

", "EyeOpen$Confidence": "

Level of confidence in the determination.

", @@ -2387,9 +2507,9 @@ } }, "StreamProcessingStartSelector": { - "base": "

", + "base": "

This is a required parameter for label detection stream processors and should not be used to start a face search stream processor.

", "refs": { - "StartStreamProcessorRequest$StartSelector": "

Specifies the starting point in the Kinesis stream to start processing. You can use the producer timestamp or the fragment number. For more information, see Fragment.

This is a required parameter for label detection stream processors and should not be used to start a face search stream processor.

" + "StartStreamProcessorRequest$StartSelector": "

Specifies the starting point in the Kinesis stream to start processing. You can use the producer timestamp or the fragment number. If you use the producer timestamp, you must put the time in milliseconds. For more information about fragment numbers, see Fragment.

This is a required parameter for label detection stream processors and should not be used to start a face search stream processor.

" } }, "StreamProcessingStopSelector": { @@ -2507,6 +2627,9 @@ "DetectModerationLabelsResponse$ModerationModelVersion": "

Version number of the moderation detection model that was used to detect unsafe content.

", "DetectProtectiveEquipmentResponse$ProtectiveEquipmentModelVersion": "

The version number of the PPE detection model used to detect PPE in the image.

", "DetectTextResponse$TextModelVersion": "

The model version used to detect text.

", + "DominantColor$HexCode": "

The Hex code equivalent of the RGB values for a dominant color.

", + "DominantColor$CSSColor": "

The CSS color name of a dominant color.

", + "DominantColor$SimplifiedColor": "

One of 12 simplified color names applied to a dominant color.

", "FaceModelVersionList$member": null, "GetCelebrityInfoResponse$Name": "

The name of the celebrity.

", "GetContentModerationResponse$ModerationModelVersion": "

Version number of the moderation detection model that was used to detect inappropriate, unwanted, or offensive content.

", @@ -2517,6 +2640,8 @@ "HumanLoopQuotaExceededException$ServiceCode": "

The service code.

", "IndexFacesResponse$FaceModelVersion": "

The version number of the face detection model that's associated with the input collection (CollectionId).

", "Label$Name": "

The name (label) of the object or scene.

", + "LabelAlias$Name": "

The name of an alias for a given label.

", + "LabelCategory$Name": "

The name of a category that applies to a given label.

", "ListFacesResponse$NextToken": "

If the response is truncated, Amazon Rekognition returns this token that you can use in the subsequent request to retrieve the next set of faces.

", "ListFacesResponse$FaceModelVersion": "

Version number of the face detection model associated with the input collection (CollectionId).

", "ModerationLabel$Name": "

The label name for the type of unsafe content detected in the image.

", @@ -2655,15 +2780,15 @@ "Timestamp": { "base": null, "refs": { - "CelebrityRecognition$Timestamp": "

The time, in milliseconds from the start of the video, that the celebrity was recognized.

", - "ContentModerationDetection$Timestamp": "

Time, in milliseconds from the beginning of the video, that the content moderation label was detected.

", - "FaceDetection$Timestamp": "

Time, in milliseconds from the start of the video, that the face was detected.

", - "LabelDetection$Timestamp": "

Time, in milliseconds from the start of the video, that the label was detected.

", - "PersonDetection$Timestamp": "

The time, in milliseconds from the start of the video, that the person's path was tracked.

", + "CelebrityRecognition$Timestamp": "

The time, in milliseconds from the start of the video, that the celebrity was recognized. Note that Timestamp is not guaranteed to be accurate to the individual frame where the celebrity first appears.

", + "ContentModerationDetection$Timestamp": "

Time, in milliseconds from the beginning of the video, that the content moderation label was detected. Note that Timestamp is not guaranteed to be accurate to the individual frame where the moderated content first appears.

", + "FaceDetection$Timestamp": "

Time, in milliseconds from the start of the video, that the face was detected. Note that Timestamp is not guaranteed to be accurate to the individual frame where the face first appears.

", + "LabelDetection$Timestamp": "

Time, in milliseconds from the start of the video, that the label was detected. Note that Timestamp is not guaranteed to be accurate to the individual frame where the label first appears.

", + "PersonDetection$Timestamp": "

The time, in milliseconds from the start of the video, that the person's path was tracked. Note that Timestamp is not guaranteed to be accurate to the individual frame where the person's path first appears.

", "PersonMatch$Timestamp": "

The time, in milliseconds from the beginning of the video, that the person was matched in the video.

", "SegmentDetection$StartTimestampMillis": "

The start time of the detected segment in milliseconds from the start of the video. This value is rounded down. For example, if the actual timestamp is 100.6667 milliseconds, Amazon Rekognition Video returns a value of 100 millis.

", "SegmentDetection$EndTimestampMillis": "

The end time of the detected segment, in milliseconds, from the start of the video. This value is rounded down.

", - "TextDetectionResult$Timestamp": "

The time, in milliseconds from the start of the video, that the text was detected.

" + "TextDetectionResult$Timestamp": "

The time, in milliseconds from the start of the video, that the text was detected. Note that Timestamp is not guaranteed to be accurate to the individual frame where the text first appears.

" } }, "TrainingData": { @@ -2695,6 +2820,9 @@ "DeleteCollectionResponse$StatusCode": "

HTTP status code that indicates the result of the operation.

", "DetectCustomLabelsRequest$MaxResults": "

Maximum number of results you want the service to return in the response. The service returns the specified number of highest confidence labels ranked from highest confidence to lowest.

", "DetectLabelsRequest$MaxLabels": "

Maximum number of labels you want the service to return in the response. The service returns the specified number of highest confidence labels.

", + "DominantColor$Red": "

The Red RGB value for a dominant color.

", + "DominantColor$Blue": "

The Blue RGB value for a dominant color.

", + "DominantColor$Green": "

The Green RGB value for a dominant color.

", "ProtectiveEquipmentPerson$Id": "

The identifier for the detected person. The identifier is only unique for a single call to DetectProtectiveEquipment.

", "ProtectiveEquipmentPersonIds$member": null, "TextDetection$Id": "

The identifier for the detected text. The identifier is only unique for a single call to DetectText.

", @@ -2708,7 +2836,7 @@ "AudioMetadata$SampleRate": "

The sample rate for the audio stream.

", "AudioMetadata$NumberOfChannels": "

The number of audio channels in the segment.

", "DescribeCollectionResponse$FaceCount": "

The number of faces that are indexed into the collection. To index faces into a collection, use IndexFaces.

", - "KinesisVideoStreamStartSelector$ProducerTimestamp": "

The timestamp from the producer corresponding to the fragment.

", + "KinesisVideoStreamStartSelector$ProducerTimestamp": "

The timestamp from the producer corresponding to the fragment, in milliseconds, expressed in unix time format.

", "ProjectVersionDescription$BillableTrainingTimeInSeconds": "

The duration, in seconds, that you were billed for a successful training of the model version. This value is only returned if the model version has been successfully trained.

", "SegmentDetection$DurationMillis": "

The duration of the detected segment in milliseconds.

", "SegmentDetection$StartFrameNumber": "

The frame number of the start of a video segment, using a frame index that starts with 0.

", diff --git a/models/apis/rekognition/2016-06-27/endpoint-rule-set-1.json b/models/apis/rekognition/2016-06-27/endpoint-rule-set-1.json new file mode 100644 index 00000000000..3427293192e --- /dev/null +++ b/models/apis/rekognition/2016-06-27/endpoint-rule-set-1.json @@ -0,0 +1,429 @@ +{ + "version": "1.0", + "parameters": { + "Region": { + "builtIn": "AWS::Region", + "required": false, + "documentation": "The AWS region used to dispatch the request.", + "type": "String" + }, + "UseDualStack": { + "builtIn": "AWS::UseDualStack", + "required": true, + "default": false, + "documentation": "When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.", + "type": "Boolean" + }, + "UseFIPS": { + "builtIn": "AWS::UseFIPS", + "required": true, + "default": false, + "documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.", + "type": "Boolean" + }, + "Endpoint": { + "builtIn": "SDK::Endpoint", + "required": false, + "documentation": "Override the endpoint used to send this request", + "type": "String" + } + }, + "rules": [ + { + "conditions": [ + { + "fn": "aws.partition", + "argv": [ + { + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Endpoint" + } + ] + }, + { + "fn": "parseURL", + "argv": [ + { + "ref": "Endpoint" + } + ], + "assign": "url" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://rekognition-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + { + "ref": "Region" + }, + "rekognition.ca-central-1" + ] + } + ], + "endpoint": { + "url": "https://rekognition-fips.ca-central-1.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + }, + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + { + "ref": "Region" + }, + "rekognition.us-east-1" + ] + } + ], + "endpoint": { + "url": "https://rekognition-fips.us-east-1.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + }, + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + { + "ref": "Region" + }, + "rekognition.us-east-2" + ] + } + ], + "endpoint": { + "url": "https://rekognition-fips.us-east-2.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + }, + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + { + "ref": "Region" + }, + "rekognition.us-west-1" + ] + } + ], + "endpoint": { + "url": "https://rekognition-fips.us-west-1.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + }, + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + { + "ref": "Region" + }, + "rekognition.us-west-2" + ] + } + ], + "endpoint": { + "url": "https://rekognition-fips.us-west-2.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + }, + { + "conditions": [ + { + "fn": "stringEquals", + "argv": [ + { + "ref": "Region" + }, + "rekognition.us-gov-west-1" + ] + } + ], + "endpoint": { + "url": "https://rekognition-fips.us-gov-west-1.amazonaws.com", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + }, + { + "conditions": [], + "endpoint": { + "url": "https://rekognition-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://rekognition.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" + } + ] + }, + { + "conditions": [], + "endpoint": { + "url": "https://rekognition.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] +} \ No newline at end of file diff --git a/models/apis/rekognition/2016-06-27/endpoint-tests-1.json b/models/apis/rekognition/2016-06-27/endpoint-tests-1.json new file mode 100644 index 00000000000..090b6215d8f --- /dev/null +++ b/models/apis/rekognition/2016-06-27/endpoint-tests-1.json @@ -0,0 +1,771 @@ +{ + "testCases": [ + { + "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.ap-south-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": true, + "Region": "ap-south-1" + } + }, + { + "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.ap-south-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": true, + "Region": "ap-south-1" + } + }, + { + "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition.ap-south-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": false, + "Region": "ap-south-1" + } + }, + { + "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition.ap-south-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": false, + "Region": "ap-south-1" + } + }, + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.ca-central-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": true, + "Region": "ca-central-1" + } + }, + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.ca-central-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": true, + "Region": "ca-central-1" + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition.ca-central-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": false, + "Region": "ca-central-1" + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition.ca-central-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": false, + "Region": "ca-central-1" + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.eu-central-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": true, + "Region": "eu-central-1" + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.eu-central-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": true, + "Region": "eu-central-1" + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition.eu-central-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": false, + "Region": "eu-central-1" + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition.eu-central-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": false, + "Region": "eu-central-1" + } + }, + { + "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.us-west-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": true, + "Region": "us-west-1" + } + }, + { + "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.us-west-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": true, + "Region": "us-west-1" + } + }, + { + "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition.us-west-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": false, + "Region": "us-west-1" + } + }, + { + "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition.us-west-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": false, + "Region": "us-west-1" + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.us-west-2.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": true, + "Region": "us-west-2" + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.us-west-2.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": true, + "Region": "us-west-2" + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition.us-west-2.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": false, + "Region": "us-west-2" + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition.us-west-2.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": false, + "Region": "us-west-2" + } + }, + { + "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.eu-west-2.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": true, + "Region": "eu-west-2" + } + }, + { + "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.eu-west-2.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": true, + "Region": "eu-west-2" + } + }, + { + "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition.eu-west-2.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": false, + "Region": "eu-west-2" + } + }, + { + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition.eu-west-2.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": false, + "Region": "eu-west-2" + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.eu-west-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": true, + "Region": "eu-west-1" + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.eu-west-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": true, + "Region": "eu-west-1" + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition.eu-west-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": false, + "Region": "eu-west-1" + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition.eu-west-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": false, + "Region": "eu-west-1" + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.ap-northeast-2.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": true, + "Region": "ap-northeast-2" + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": true, + "Region": "ap-northeast-2" + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition.ap-northeast-2.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": false, + "Region": "ap-northeast-2" + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": false, + "Region": "ap-northeast-2" + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.ap-northeast-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": true, + "Region": "ap-northeast-1" + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": true, + "Region": "ap-northeast-1" + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition.ap-northeast-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": false, + "Region": "ap-northeast-1" + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": false, + "Region": "ap-northeast-1" + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.us-gov-west-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": true, + "Region": "us-gov-west-1" + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.us-gov-west-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": true, + "Region": "us-gov-west-1" + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition.us-gov-west-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": false, + "Region": "us-gov-west-1" + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition.us-gov-west-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": false, + "Region": "us-gov-west-1" + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.ap-southeast-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": true, + "Region": "ap-southeast-1" + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": true, + "Region": "ap-southeast-1" + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition.ap-southeast-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": false, + "Region": "ap-southeast-1" + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": false, + "Region": "ap-southeast-1" + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.ap-southeast-2.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": true, + "Region": "ap-southeast-2" + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": true, + "Region": "ap-southeast-2" + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition.ap-southeast-2.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": false, + "Region": "ap-southeast-2" + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": false, + "Region": "ap-southeast-2" + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.us-east-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": true, + "Region": "us-east-1" + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.us-east-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": true, + "Region": "us-east-1" + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition.us-east-1.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": false, + "Region": "us-east-1" + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition.us-east-1.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": false, + "Region": "us-east-1" + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.us-east-2.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": true, + "Region": "us-east-2" + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition-fips.us-east-2.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": true, + "Region": "us-east-2" + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://rekognition.us-east-2.api.aws" + } + }, + "params": { + "UseDualStack": true, + "UseFIPS": false, + "Region": "us-east-2" + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://rekognition.us-east-2.amazonaws.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": false, + "Region": "us-east-2" + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { + "UseDualStack": false, + "UseFIPS": false, + "Region": "us-east-1", + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips enabled and dualstack disabled", + "expect": { + "error": "Invalid Configuration: FIPS and custom endpoint are not supported" + }, + "params": { + "UseDualStack": false, + "UseFIPS": true, + "Region": "us-east-1", + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack enabled", + "expect": { + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" + }, + "params": { + "UseDualStack": true, + "UseFIPS": false, + "Region": "us-east-1", + "Endpoint": "https://example.com" + } + } + ], + "version": "1.0" +} \ No newline at end of file diff --git a/models/apis/securityhub/2018-10-26/docs-2.json b/models/apis/securityhub/2018-10-26/docs-2.json index abf856f4d60..a82ba7c1c1d 100644 --- a/models/apis/securityhub/2018-10-26/docs-2.json +++ b/models/apis/securityhub/2018-10-26/docs-2.json @@ -426,7 +426,7 @@ } }, "AwsBackupBackupPlanRuleCopyActionsDetails": { - "base": "

An array of CopyAction objects, which contains the details of the copy operation.

", + "base": "

An array of CopyAction objects, each of which contains details of the copy operation.

", "refs": { "AwsBackupBackupPlanRuleCopyActionsList$member": null } @@ -434,7 +434,7 @@ "AwsBackupBackupPlanRuleCopyActionsList": { "base": null, "refs": { - "AwsBackupBackupPlanRuleDetails$CopyActions": "

An array of CopyAction objects, which contains the details of the copy operation.

" + "AwsBackupBackupPlanRuleDetails$CopyActions": "

An array of CopyAction objects, each of which contains details of the copy operation.

" } }, "AwsBackupBackupPlanRuleDetails": { @@ -6828,11 +6828,11 @@ "AwsRdsPendingCloudWatchLogsExports$LogTypesToEnable": "

A list of log types that are being enabled.

", "AwsRdsPendingCloudWatchLogsExports$LogTypesToDisable": "

A list of log types that are being disabled.

", "AwsRedshiftClusterDetails$PendingActions": "

A list of cluster operations that are waiting to start.

", - "CreateFindingAggregatorRequest$Regions": "

If RegionLinkingMode is ALL_REGIONS_EXCEPT_SPECIFIED, then this is a comma-separated list of Regions that do not aggregate findings to the aggregation Region.

If RegionLinkingMode is SPECIFIED_REGIONS, then this is a comma-separated list of Regions that do aggregate findings to the aggregation Region.

", + "CreateFindingAggregatorRequest$Regions": "

If RegionLinkingMode is ALL_REGIONS_EXCEPT_SPECIFIED, then this is a space-separated list of Regions that do not aggregate findings to the aggregation Region.

If RegionLinkingMode is SPECIFIED_REGIONS, then this is a space-separated list of Regions that do aggregate findings to the aggregation Region.

", "CreateFindingAggregatorResponse$Regions": "

The list of excluded Regions or included Regions.

", "GetFindingAggregatorResponse$Regions": "

The list of excluded Regions or included Regions.

", "NetworkPathComponentDetails$Address": "

The IP addresses of the destination.

", - "UpdateFindingAggregatorRequest$Regions": "

If RegionLinkingMode is ALL_REGIONS_EXCEPT_SPECIFIED, then this is a comma-separated list of Regions that do not aggregate findings to the aggregation Region.

If RegionLinkingMode is SPECIFIED_REGIONS, then this is a comma-separated list of Regions that do aggregate findings to the aggregation Region.

", + "UpdateFindingAggregatorRequest$Regions": "

If RegionLinkingMode is ALL_REGIONS_EXCEPT_SPECIFIED, then this is a space-separated list of Regions that do not aggregate findings to the aggregation Region.

If RegionLinkingMode is SPECIFIED_REGIONS, then this is a space-separated list of Regions that do aggregate findings to the aggregation Region.

", "UpdateFindingAggregatorResponse$Regions": "

The list of excluded Regions or included Regions.

", "Vulnerability$RelatedVulnerabilities": "

List of vulnerabilities that are related to this vulnerability.

", "Vulnerability$ReferenceUrls": "

A list of URLs that provide additional information about the vulnerability.

" diff --git a/models/apis/securityhub/2018-10-26/endpoint-rule-set-1.json b/models/apis/securityhub/2018-10-26/endpoint-rule-set-1.json new file mode 100644 index 00000000000..017631868c2 --- /dev/null +++ b/models/apis/securityhub/2018-10-26/endpoint-rule-set-1.json @@ -0,0 +1,315 @@ +{ + "version": "1.0", + "parameters": { + "Region": { + "builtIn": "AWS::Region", + "required": false, + "documentation": "The AWS region used to dispatch the request.", + "type": "String" + }, + "UseDualStack": { + "builtIn": "AWS::UseDualStack", + "required": true, + "default": false, + "documentation": "When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.", + "type": "Boolean" + }, + "UseFIPS": { + "builtIn": "AWS::UseFIPS", + "required": true, + "default": false, + "documentation": "When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.", + "type": "Boolean" + }, + "Endpoint": { + "builtIn": "SDK::Endpoint", + "required": false, + "documentation": "Override the endpoint used to send this request", + "type": "String" + } + }, + "rules": [ + { + "conditions": [ + { + "fn": "aws.partition", + "argv": [ + { + "ref": "Region" + } + ], + "assign": "PartitionResult" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "isSet", + "argv": [ + { + "ref": "Endpoint" + } + ] + }, + { + "fn": "parseURL", + "argv": [ + { + "ref": "Endpoint" + } + ], + "assign": "url" + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "error": "Invalid Configuration: FIPS and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported", + "type": "error" + }, + { + "conditions": [], + "endpoint": { + "url": { + "ref": "Endpoint" + }, + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + }, + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + }, + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://securityhub-fips.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "FIPS and DualStack are enabled, but this partition does not support one or both", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseFIPS" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsFIPS" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://securityhub-fips.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] + }, + { + "conditions": [], + "error": "FIPS is enabled but this partition does not support FIPS", + "type": "error" + } + ] + }, + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + { + "ref": "UseDualStack" + }, + true + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [ + { + "fn": "booleanEquals", + "argv": [ + true, + { + "fn": "getAttr", + "argv": [ + { + "ref": "PartitionResult" + }, + "supportsDualStack" + ] + } + ] + } + ], + "type": "tree", + "rules": [ + { + "conditions": [], + "endpoint": { + "url": "https://securityhub.{Region}.{PartitionResult#dualStackDnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + }, + { + "conditions": [], + "error": "DualStack is enabled but this partition does not support DualStack", + "type": "error" + } + ] + }, + { + "conditions": [], + "endpoint": { + "url": "https://securityhub.{Region}.{PartitionResult#dnsSuffix}", + "properties": {}, + "headers": {} + }, + "type": "endpoint" + } + ] + } + ] +} \ No newline at end of file diff --git a/models/apis/securityhub/2018-10-26/endpoint-tests-1.json b/models/apis/securityhub/2018-10-26/endpoint-tests-1.json new file mode 100644 index 00000000000..28d9ea1eea7 --- /dev/null +++ b/models/apis/securityhub/2018-10-26/endpoint-tests-1.json @@ -0,0 +1,1395 @@ +{ + "testCases": [ + { + "documentation": "For region ap-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-south-1.api.aws" + } + }, + "params": { + "Region": "ap-south-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-south-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-south-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-south-1.api.aws" + } + }, + "params": { + "Region": "ap-south-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-south-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-south-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.eu-south-1.api.aws" + } + }, + "params": { + "Region": "eu-south-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.eu-south-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-south-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.eu-south-1.api.aws" + } + }, + "params": { + "Region": "eu-south-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.eu-south-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-south-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.us-gov-east-1.api.aws" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.us-gov-east-1.api.aws" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.us-gov-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ca-central-1.api.aws" + } + }, + "params": { + "Region": "ca-central-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ca-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ca-central-1.amazonaws.com" + } + }, + "params": { + "Region": "ca-central-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ca-central-1.api.aws" + } + }, + "params": { + "Region": "ca-central-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ca-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ca-central-1.amazonaws.com" + } + }, + "params": { + "Region": "ca-central-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.eu-central-1.api.aws" + } + }, + "params": { + "Region": "eu-central-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-central-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.eu-central-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-central-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.eu-central-1.api.aws" + } + }, + "params": { + "Region": "eu-central-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-central-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.eu-central-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-central-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.us-west-1.api.aws" + } + }, + "params": { + "Region": "us-west-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.us-west-1.amazonaws.com" + } + }, + "params": { + "Region": "us-west-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.us-west-1.api.aws" + } + }, + "params": { + "Region": "us-west-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.us-west-1.amazonaws.com" + } + }, + "params": { + "Region": "us-west-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.us-west-2.api.aws" + } + }, + "params": { + "Region": "us-west-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.us-west-2.amazonaws.com" + } + }, + "params": { + "Region": "us-west-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.us-west-2.api.aws" + } + }, + "params": { + "Region": "us-west-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.us-west-2.amazonaws.com" + } + }, + "params": { + "Region": "us-west-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region af-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.af-south-1.api.aws" + } + }, + "params": { + "Region": "af-south-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region af-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.af-south-1.amazonaws.com" + } + }, + "params": { + "Region": "af-south-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region af-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.af-south-1.api.aws" + } + }, + "params": { + "Region": "af-south-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region af-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.af-south-1.amazonaws.com" + } + }, + "params": { + "Region": "af-south-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-north-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.eu-north-1.api.aws" + } + }, + "params": { + "Region": "eu-north-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-north-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.eu-north-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-north-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-north-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.eu-north-1.api.aws" + } + }, + "params": { + "Region": "eu-north-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-north-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.eu-north-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-north-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-3 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.eu-west-3.api.aws" + } + }, + "params": { + "Region": "eu-west-3", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-3 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.eu-west-3.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-3", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-3 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.eu-west-3.api.aws" + } + }, + "params": { + "Region": "eu-west-3", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-3 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.eu-west-3.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-3", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.eu-west-2.api.aws" + } + }, + "params": { + "Region": "eu-west-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.eu-west-2.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.eu-west-2.api.aws" + } + }, + "params": { + "Region": "eu-west-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.eu-west-2.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.eu-west-1.api.aws" + } + }, + "params": { + "Region": "eu-west-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.eu-west-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.eu-west-1.api.aws" + } + }, + "params": { + "Region": "eu-west-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region eu-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.eu-west-1.amazonaws.com" + } + }, + "params": { + "Region": "eu-west-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-northeast-3.api.aws" + } + }, + "params": { + "Region": "ap-northeast-3", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-northeast-3.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-3", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-northeast-3.api.aws" + } + }, + "params": { + "Region": "ap-northeast-3", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-3 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-northeast-3.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-3", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-northeast-2.api.aws" + } + }, + "params": { + "Region": "ap-northeast-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-northeast-2.api.aws" + } + }, + "params": { + "Region": "ap-northeast-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-northeast-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-northeast-1.api.aws" + } + }, + "params": { + "Region": "ap-northeast-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-northeast-1.api.aws" + } + }, + "params": { + "Region": "ap-northeast-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-northeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-northeast-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-northeast-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region me-south-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.me-south-1.api.aws" + } + }, + "params": { + "Region": "me-south-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region me-south-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.me-south-1.amazonaws.com" + } + }, + "params": { + "Region": "me-south-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region me-south-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.me-south-1.api.aws" + } + }, + "params": { + "Region": "me-south-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region me-south-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.me-south-1.amazonaws.com" + } + }, + "params": { + "Region": "me-south-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region sa-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.sa-east-1.api.aws" + } + }, + "params": { + "Region": "sa-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region sa-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.sa-east-1.amazonaws.com" + } + }, + "params": { + "Region": "sa-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region sa-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.sa-east-1.api.aws" + } + }, + "params": { + "Region": "sa-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region sa-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.sa-east-1.amazonaws.com" + } + }, + "params": { + "Region": "sa-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-east-1.api.aws" + } + }, + "params": { + "Region": "ap-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-east-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-east-1.api.aws" + } + }, + "params": { + "Region": "ap-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-east-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.cn-north-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-north-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.cn-north-1.amazonaws.com.cn" + } + }, + "params": { + "Region": "cn-north-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.us-gov-west-1.api.aws" + } + }, + "params": { + "Region": "us-gov-west-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.us-gov-west-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-west-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.us-gov-west-1.api.aws" + } + }, + "params": { + "Region": "us-gov-west-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-gov-west-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.us-gov-west-1.amazonaws.com" + } + }, + "params": { + "Region": "us-gov-west-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-southeast-1.api.aws" + } + }, + "params": { + "Region": "ap-southeast-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-southeast-1.api.aws" + } + }, + "params": { + "Region": "ap-southeast-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-southeast-1.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-southeast-2.api.aws" + } + }, + "params": { + "Region": "ap-southeast-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-southeast-2.api.aws" + } + }, + "params": { + "Region": "ap-southeast-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-southeast-2.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-southeast-3.api.aws" + } + }, + "params": { + "Region": "ap-southeast-3", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-3 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.ap-southeast-3.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-3", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-southeast-3.api.aws" + } + }, + "params": { + "Region": "ap-southeast-3", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region ap-southeast-3 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.ap-southeast-3.amazonaws.com" + } + }, + "params": { + "Region": "ap-southeast-3", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.us-east-1.api.aws" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.us-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.us-east-1.api.aws" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.us-east-1.amazonaws.com" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.us-east-2.api.aws" + } + }, + "params": { + "Region": "us-east-2", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-2 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.us-east-2.amazonaws.com" + } + }, + "params": { + "Region": "us-east-2", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.us-east-2.api.aws" + } + }, + "params": { + "Region": "us-east-2", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region us-east-2 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.us-east-2.amazonaws.com" + } + }, + "params": { + "Region": "us-east-2", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.cn-northwest-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "Region": "cn-northwest-1", + "UseFIPS": true, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS enabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub-fips.cn-northwest-1.amazonaws.com.cn" + } + }, + "params": { + "Region": "cn-northwest-1", + "UseFIPS": true, + "UseDualStack": false + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack enabled", + "expect": { + "endpoint": { + "url": "https://securityhub.cn-northwest-1.api.amazonwebservices.com.cn" + } + }, + "params": { + "Region": "cn-northwest-1", + "UseFIPS": false, + "UseDualStack": true + } + }, + { + "documentation": "For region cn-northwest-1 with FIPS disabled and DualStack disabled", + "expect": { + "endpoint": { + "url": "https://securityhub.cn-northwest-1.amazonaws.com.cn" + } + }, + "params": { + "Region": "cn-northwest-1", + "UseFIPS": false, + "UseDualStack": false + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack disabled", + "expect": { + "endpoint": { + "url": "https://example.com" + } + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips enabled and dualstack disabled", + "expect": { + "error": "Invalid Configuration: FIPS and custom endpoint are not supported" + }, + "params": { + "Region": "us-east-1", + "UseFIPS": true, + "UseDualStack": false, + "Endpoint": "https://example.com" + } + }, + { + "documentation": "For custom endpoint with fips disabled and dualstack enabled", + "expect": { + "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" + }, + "params": { + "Region": "us-east-1", + "UseFIPS": false, + "UseDualStack": true, + "Endpoint": "https://example.com" + } + } + ], + "version": "1.0" +} \ No newline at end of file diff --git a/models/apis/ssm-incidents/2018-05-10/api-2.json b/models/apis/ssm-incidents/2018-05-10/api-2.json index 3b3b4007a83..c5b57fc13a9 100644 --- a/models/apis/ssm-incidents/2018-05-10/api-2.json +++ b/models/apis/ssm-incidents/2018-05-10/api-2.json @@ -690,6 +690,7 @@ "idempotencyToken":true }, "eventData":{"shape":"EventData"}, + "eventReferences":{"shape":"EventReferenceList"}, "eventTime":{"shape":"Timestamp"}, "eventType":{"shape":"TimelineEventType"}, "incidentRecordArn":{"shape":"Arn"} @@ -822,7 +823,21 @@ }, "EventData":{ "type":"string", - "max":6000, + "max":12000, + "min":0 + }, + "EventReference":{ + "type":"structure", + "members":{ + "relatedItemId":{"shape":"GeneratedId"}, + "resource":{"shape":"Arn"} + }, + "union":true + }, + "EventReferenceList":{ + "type":"list", + "member":{"shape":"EventReference"}, + "max":10, "min":0 }, "EventSummary":{ @@ -836,6 +851,7 @@ ], "members":{ "eventId":{"shape":"UUID"}, + "eventReferences":{"shape":"EventReferenceList"}, "eventTime":{"shape":"Timestamp"}, "eventType":{"shape":"TimelineEventType"}, "eventUpdatedTime":{"shape":"Timestamp"}, @@ -871,6 +887,12 @@ "max":5, "min":0 }, + "GeneratedId":{ + "type":"string", + "max":200, + "min":0, + "pattern":"^related-item/(ANALYSIS|INCIDENT|METRIC|PARENT|ATTACHMENT|OTHER|AUTOMATION|INVOLVED_RESOURCE|TASK)/([0-9]|[A-F]){32}$" + }, "GetIncidentRecordInput":{ "type":"structure", "required":["arn"], @@ -1360,6 +1382,7 @@ "type":"structure", "required":["identifier"], "members":{ + "generatedId":{"shape":"GeneratedId"}, "identifier":{"shape":"ItemIdentifier"}, "title":{"shape":"RelatedItemTitleString"} } @@ -1720,6 +1743,7 @@ "members":{ "eventData":{"shape":"EventData"}, "eventId":{"shape":"UUID"}, + "eventReferences":{"shape":"EventReferenceList"}, "eventTime":{"shape":"Timestamp"}, "eventType":{"shape":"TimelineEventType"}, "eventUpdatedTime":{"shape":"Timestamp"}, @@ -1913,6 +1937,7 @@ }, "eventData":{"shape":"EventData"}, "eventId":{"shape":"UUID"}, + "eventReferences":{"shape":"EventReferenceList"}, "eventTime":{"shape":"Timestamp"}, "eventType":{"shape":"TimelineEventType"}, "incidentRecordArn":{"shape":"Arn"} diff --git a/models/apis/ssm-incidents/2018-05-10/docs-2.json b/models/apis/ssm-incidents/2018-05-10/docs-2.json index 5496c53cd10..338495ec099 100644 --- a/models/apis/ssm-incidents/2018-05-10/docs-2.json +++ b/models/apis/ssm-incidents/2018-05-10/docs-2.json @@ -71,6 +71,7 @@ "DeleteResourcePolicyInput$resourceArn": "

The Amazon Resource Name (ARN) of the resource you're deleting the policy from.

", "DeleteResponsePlanInput$arn": "

The Amazon Resource Name (ARN) of the response plan.

", "DeleteTimelineEventInput$incidentRecordArn": "

The Amazon Resource Name (ARN) of the incident that includes the timeline event.

", + "EventReference$resource": "

The Amazon Resource Name (ARN) of an Amazon Web Services resource referenced in a TimelineEvent.

", "EventSummary$incidentRecordArn": "

The Amazon Resource Name (ARN) of the incident that the event happened during.

", "GetIncidentRecordInput$arn": "

The Amazon Resource Name (ARN) of the incident record.

", "GetReplicationSetInput$arn": "

The Amazon Resource Name (ARN) of the replication set you want to retrieve.

", @@ -306,6 +307,21 @@ "UpdateTimelineEventInput$eventData": "

A short description of the event.

" } }, + "EventReference": { + "base": "

An item referenced in a TimelineEvent that is involved in or somehow associated with an incident. You can specify an Amazon Resource Name (ARN) for an Amazon Web Services resource or a RelatedItem ID.

", + "refs": { + "EventReferenceList$member": null + } + }, + "EventReferenceList": { + "base": null, + "refs": { + "CreateTimelineEventInput$eventReferences": "

Adds one or more references to the TimelineEvent. A reference can be an Amazon Web Services resource involved in the incident or in some way associated with it. When you specify a reference, you enter the Amazon Resource Name (ARN) of the resource. You can also specify a related item. As an example, you could specify the ARN of an Amazon DynamoDB (DynamoDB) table. The table for this example is the resource. You could also specify a Amazon CloudWatch metric for that table. The metric is the related item.

", + "EventSummary$eventReferences": "

A list of references in a TimelineEvent.

", + "TimelineEvent$eventReferences": "

A list of references in a TimelineEvent.

", + "UpdateTimelineEventInput$eventReferences": "

Updates all existing references in a TimelineEvent. A reference can be an Amazon Web Services resource involved in the incident or in some way associated with it. When you specify a reference, you enter the Amazon Resource Name (ARN) of the resource. You can also specify a related item. As an example, you could specify the ARN of an Amazon DynamoDB (DynamoDB) table. The table for this example is the resource. You could also specify a Amazon CloudWatch metric for that table. The metric is the related item.

This update action overrides all existing references. If you want to keep existing references, you must specify them in the call. If you don't, this action removes them and enters only new references.

" + } + }, "EventSummary": { "base": "

Details about a timeline event during an incident.

", "refs": { @@ -349,6 +365,13 @@ "ListTimelineEventsInput$filters": "

Filters the timeline events based on the provided conditional values. You can filter timeline events using the following keys:

Note the following when deciding how to use Filters:

" } }, + "GeneratedId": { + "base": null, + "refs": { + "EventReference$relatedItemId": "

The ID of a RelatedItem referenced in a TimelineEvent.

", + "RelatedItem$generatedId": "

A unique ID for a RelatedItem.

Don't specify this parameter when you add a RelatedItem by using the UpdateRelatedItems API action.

" + } + }, "GetIncidentRecordInput": { "base": null, "refs": { diff --git a/models/apis/ssm-incidents/2018-05-10/endpoint-tests-1.json b/models/apis/ssm-incidents/2018-05-10/endpoint-tests-1.json index 9be57ba056a..7777009da9d 100644 --- a/models/apis/ssm-incidents/2018-05-10/endpoint-tests-1.json +++ b/models/apis/ssm-incidents/2018-05-10/endpoint-tests-1.json @@ -8,9 +8,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ap-south-1", - "UseDualStack": true + "Region": "ap-south-1" } }, { @@ -21,9 +21,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-south-1", - "UseDualStack": false + "Region": "ap-south-1" } }, { @@ -34,9 +34,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ap-south-1", - "UseDualStack": true + "Region": "ap-south-1" } }, { @@ -47,9 +47,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-south-1", - "UseDualStack": false + "Region": "ap-south-1" } }, { @@ -60,9 +60,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ca-central-1", - "UseDualStack": true + "Region": "ca-central-1" } }, { @@ -73,9 +73,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ca-central-1", - "UseDualStack": false + "Region": "ca-central-1" } }, { @@ -86,9 +86,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ca-central-1", - "UseDualStack": true + "Region": "ca-central-1" } }, { @@ -99,9 +99,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ca-central-1", - "UseDualStack": false + "Region": "ca-central-1" } }, { @@ -112,9 +112,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "eu-central-1", - "UseDualStack": true + "Region": "eu-central-1" } }, { @@ -125,9 +125,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "eu-central-1", - "UseDualStack": false + "Region": "eu-central-1" } }, { @@ -138,9 +138,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "eu-central-1", - "UseDualStack": true + "Region": "eu-central-1" } }, { @@ -151,9 +151,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "eu-central-1", - "UseDualStack": false + "Region": "eu-central-1" } }, { @@ -164,9 +164,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "us-west-1", - "UseDualStack": true + "Region": "us-west-1" } }, { @@ -177,9 +177,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-west-1", - "UseDualStack": false + "Region": "us-west-1" } }, { @@ -190,9 +190,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "us-west-1", - "UseDualStack": true + "Region": "us-west-1" } }, { @@ -203,9 +203,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-west-1", - "UseDualStack": false + "Region": "us-west-1" } }, { @@ -216,9 +216,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "us-west-2", - "UseDualStack": true + "Region": "us-west-2" } }, { @@ -229,9 +229,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-west-2", - "UseDualStack": false + "Region": "us-west-2" } }, { @@ -242,9 +242,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "us-west-2", - "UseDualStack": true + "Region": "us-west-2" } }, { @@ -255,9 +255,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-west-2", - "UseDualStack": false + "Region": "us-west-2" } }, { @@ -268,9 +268,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "eu-north-1", - "UseDualStack": true + "Region": "eu-north-1" } }, { @@ -281,9 +281,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "eu-north-1", - "UseDualStack": false + "Region": "eu-north-1" } }, { @@ -294,9 +294,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "eu-north-1", - "UseDualStack": true + "Region": "eu-north-1" } }, { @@ -307,9 +307,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "eu-north-1", - "UseDualStack": false + "Region": "eu-north-1" } }, { @@ -320,9 +320,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "eu-west-3", - "UseDualStack": true + "Region": "eu-west-3" } }, { @@ -333,9 +333,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "eu-west-3", - "UseDualStack": false + "Region": "eu-west-3" } }, { @@ -346,9 +346,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "eu-west-3", - "UseDualStack": true + "Region": "eu-west-3" } }, { @@ -359,9 +359,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "eu-west-3", - "UseDualStack": false + "Region": "eu-west-3" } }, { @@ -372,9 +372,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "eu-west-2", - "UseDualStack": true + "Region": "eu-west-2" } }, { @@ -385,9 +385,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "eu-west-2", - "UseDualStack": false + "Region": "eu-west-2" } }, { @@ -398,9 +398,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "eu-west-2", - "UseDualStack": true + "Region": "eu-west-2" } }, { @@ -411,9 +411,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "eu-west-2", - "UseDualStack": false + "Region": "eu-west-2" } }, { @@ -424,9 +424,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "eu-west-1", - "UseDualStack": true + "Region": "eu-west-1" } }, { @@ -437,9 +437,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "eu-west-1", - "UseDualStack": false + "Region": "eu-west-1" } }, { @@ -450,9 +450,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "eu-west-1", - "UseDualStack": true + "Region": "eu-west-1" } }, { @@ -463,9 +463,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "eu-west-1", - "UseDualStack": false + "Region": "eu-west-1" } }, { @@ -476,9 +476,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ap-northeast-2", - "UseDualStack": true + "Region": "ap-northeast-2" } }, { @@ -489,9 +489,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-northeast-2", - "UseDualStack": false + "Region": "ap-northeast-2" } }, { @@ -502,9 +502,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ap-northeast-2", - "UseDualStack": true + "Region": "ap-northeast-2" } }, { @@ -515,9 +515,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-northeast-2", - "UseDualStack": false + "Region": "ap-northeast-2" } }, { @@ -528,9 +528,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ap-northeast-1", - "UseDualStack": true + "Region": "ap-northeast-1" } }, { @@ -541,9 +541,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-northeast-1", - "UseDualStack": false + "Region": "ap-northeast-1" } }, { @@ -554,9 +554,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ap-northeast-1", - "UseDualStack": true + "Region": "ap-northeast-1" } }, { @@ -567,9 +567,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-northeast-1", - "UseDualStack": false + "Region": "ap-northeast-1" } }, { @@ -580,9 +580,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "sa-east-1", - "UseDualStack": true + "Region": "sa-east-1" } }, { @@ -593,9 +593,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "sa-east-1", - "UseDualStack": false + "Region": "sa-east-1" } }, { @@ -606,9 +606,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "sa-east-1", - "UseDualStack": true + "Region": "sa-east-1" } }, { @@ -619,9 +619,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "sa-east-1", - "UseDualStack": false + "Region": "sa-east-1" } }, { @@ -632,9 +632,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ap-southeast-1", - "UseDualStack": true + "Region": "ap-southeast-1" } }, { @@ -645,9 +645,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-southeast-1", - "UseDualStack": false + "Region": "ap-southeast-1" } }, { @@ -658,9 +658,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ap-southeast-1", - "UseDualStack": true + "Region": "ap-southeast-1" } }, { @@ -671,9 +671,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-southeast-1", - "UseDualStack": false + "Region": "ap-southeast-1" } }, { @@ -684,9 +684,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "ap-southeast-2", - "UseDualStack": true + "Region": "ap-southeast-2" } }, { @@ -697,9 +697,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "ap-southeast-2", - "UseDualStack": false + "Region": "ap-southeast-2" } }, { @@ -710,9 +710,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "ap-southeast-2", - "UseDualStack": true + "Region": "ap-southeast-2" } }, { @@ -723,9 +723,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "ap-southeast-2", - "UseDualStack": false + "Region": "ap-southeast-2" } }, { @@ -736,9 +736,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "us-east-1", - "UseDualStack": true + "Region": "us-east-1" } }, { @@ -749,9 +749,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-east-1", - "UseDualStack": false + "Region": "us-east-1" } }, { @@ -762,9 +762,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "us-east-1", - "UseDualStack": true + "Region": "us-east-1" } }, { @@ -775,9 +775,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-east-1", - "UseDualStack": false + "Region": "us-east-1" } }, { @@ -788,9 +788,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": true, - "Region": "us-east-2", - "UseDualStack": true + "Region": "us-east-2" } }, { @@ -801,9 +801,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": true, - "Region": "us-east-2", - "UseDualStack": false + "Region": "us-east-2" } }, { @@ -814,9 +814,9 @@ } }, "params": { + "UseDualStack": true, "UseFIPS": false, - "Region": "us-east-2", - "UseDualStack": true + "Region": "us-east-2" } }, { @@ -827,9 +827,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, - "Region": "us-east-2", - "UseDualStack": false + "Region": "us-east-2" } }, { @@ -840,9 +840,9 @@ } }, "params": { + "UseDualStack": false, "UseFIPS": false, "Region": "us-east-1", - "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -852,9 +852,9 @@ "error": "Invalid Configuration: FIPS and custom endpoint are not supported" }, "params": { + "UseDualStack": false, "UseFIPS": true, "Region": "us-east-1", - "UseDualStack": false, "Endpoint": "https://example.com" } }, @@ -864,9 +864,9 @@ "error": "Invalid Configuration: Dualstack and custom endpoint are not supported" }, "params": { + "UseDualStack": true, "UseFIPS": false, "Region": "us-east-1", - "UseDualStack": true, "Endpoint": "https://example.com" } } diff --git a/models/endpoints/endpoints.json b/models/endpoints/endpoints.json index d7051ce595d..a971baf16de 100644 --- a/models/endpoints/endpoints.json +++ b/models/endpoints/endpoints.json @@ -5633,6 +5633,7 @@ "ap-south-1" : { }, "ap-southeast-1" : { }, "ap-southeast-2" : { }, + "ap-southeast-3" : { }, "ca-central-1" : { }, "eu-central-1" : { }, "eu-north-1" : { }, @@ -6689,6 +6690,7 @@ }, "gamesparks" : { "endpoints" : { + "ap-northeast-1" : { }, "us-east-1" : { } } }, @@ -9865,7 +9867,6 @@ "ap-south-1" : { }, "ap-southeast-1" : { }, "ap-southeast-2" : { }, - "ap-southeast-3" : { }, "ca-central-1" : { "variants" : [ { "hostname" : "network-firewall-fips.ca-central-1.amazonaws.com", @@ -12405,6 +12406,19 @@ "isRegionalized" : false, "partitionEndpoint" : "aws-global" }, + "scheduler" : { + "endpoints" : { + "ap-northeast-1" : { }, + "ap-southeast-1" : { }, + "ap-southeast-2" : { }, + "eu-central-1" : { }, + "eu-north-1" : { }, + "eu-west-1" : { }, + "us-east-1" : { }, + "us-east-2" : { }, + "us-west-2" : { } + } + }, "schemas" : { "endpoints" : { "ap-east-1" : { }, diff --git a/service/glue/api.go b/service/glue/api.go index 1838f152258..672b56ba607 100644 --- a/service/glue/api.go +++ b/service/glue/api.go @@ -7792,7 +7792,7 @@ func (c *Glue) GetDevEndpointsRequest(input *GetDevEndpointsInput) (req *request // GetDevEndpoints API operation for AWS Glue. // -// Retrieves all the development endpoints in this AWS account. +// Retrieves all the development endpoints in this Amazon Web Services account. // // When you create a development endpoint in a virtual private cloud (VPC), // Glue returns only a private IP address and the public IP address field is @@ -8026,6 +8026,14 @@ func (c *Glue) GetJobBookmarkRequest(input *GetJobBookmarkInput) (req *request.R // // Returns information on a job bookmark entry. // +// For more information about enabling and using job bookmarks, see: +// +// - Tracking processed data using job bookmarks (https://docs.aws.amazon.com/glue/latest/dg/monitor-continuations.html) +// +// - Job parameters used by Glue (https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-etl-glue-arguments.html) +// +// - Job structure (https://docs.aws.amazon.com/glue/latest/dg/aws-glue-api-jobs-job.html#aws-glue-api-jobs-job-Job) +// // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. @@ -15113,6 +15121,14 @@ func (c *Glue) ResetJobBookmarkRequest(input *ResetJobBookmarkInput) (req *reque // // Resets a bookmark entry. // +// For more information about enabling and using job bookmarks, see: +// +// - Tracking processed data using job bookmarks (https://docs.aws.amazon.com/glue/latest/dg/monitor-continuations.html) +// +// - Job parameters used by Glue (https://docs.aws.amazon.com/glue/latest/dg/aws-glue-programming-etl-glue-arguments.html) +// +// - Job structure (https://docs.aws.amazon.com/glue/latest/dg/aws-glue-api-jobs-job.html#aws-glue-api-jobs-job-Job) +// // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. @@ -27529,7 +27545,7 @@ type CreateDevEndpointOutput struct { // APIs. If no arguments are provided, the version defaults to Python 2. Arguments map[string]*string `type:"map"` - // The AWS Availability Zone where this DevEndpoint is located. + // The Amazon Web Services Availability Zone where this DevEndpoint is located. AvailabilityZone *string `type:"string"` // The point in time at which this DevEndpoint was created. @@ -33662,7 +33678,7 @@ type DevEndpoint struct { // APIs. If no arguments are provided, the version defaults to Python 2. Arguments map[string]*string `type:"map"` - // The AWS Availability Zone where this DevEndpoint is located. + // The Amazon Web Services Availability Zone where this DevEndpoint is located. AvailabilityZone *string `type:"string"` // The point in time at which this DevEndpoint was created. diff --git a/service/iot/api.go b/service/iot/api.go index f627de13e4c..1684c305f92 100644 --- a/service/iot/api.go +++ b/service/iot/api.go @@ -17304,6 +17304,116 @@ func (c *IoT) ListProvisioningTemplatesPagesWithContext(ctx aws.Context, input * return p.Err() } +const opListRelatedResourcesForAuditFinding = "ListRelatedResourcesForAuditFinding" + +// ListRelatedResourcesForAuditFindingRequest generates a "aws/request.Request" representing the +// client's request for the ListRelatedResourcesForAuditFinding operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See ListRelatedResourcesForAuditFinding for more information on using the ListRelatedResourcesForAuditFinding +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the ListRelatedResourcesForAuditFindingRequest method. +// req, resp := client.ListRelatedResourcesForAuditFindingRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +func (c *IoT) ListRelatedResourcesForAuditFindingRequest(input *ListRelatedResourcesForAuditFindingInput) (req *request.Request, output *ListRelatedResourcesForAuditFindingOutput) { + op := &request.Operation{ + Name: opListRelatedResourcesForAuditFinding, + HTTPMethod: "GET", + HTTPPath: "/audit/relatedResources", + } + + if input == nil { + input = &ListRelatedResourcesForAuditFindingInput{} + } + + output = &ListRelatedResourcesForAuditFindingOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListRelatedResourcesForAuditFinding API operation for AWS IoT. +// +// The related resources of an Audit finding. The following resources can be +// returned from calling this API: +// +// - DEVICE_CERTIFICATE +// +// - CA_CERTIFICATE +// +// - IOT_POLICY +// +// - COGNITO_IDENTITY_POOL +// +// - CLIENT_ID +// +// - ACCOUNT_SETTINGS +// +// - ROLE_ALIAS +// +// - IAM_ROLE +// +// - ISSUER_CERTIFICATE +// +// This API is similar to DescribeAuditFinding's RelatedResources (https://docs.aws.amazon.com/iot/latest/apireference/API_DescribeAuditFinding.html) +// but provides pagination and is not limited to 10 resources. When calling +// DescribeAuditFinding (https://docs.aws.amazon.com/iot/latest/apireference/API_DescribeAuditFinding.html) +// for the intermediate CA revoked for active device certificates check, RelatedResources +// will not be populated. You must use this API, ListRelatedResourcesForAuditFinding, +// to list the certificates. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS IoT's +// API operation ListRelatedResourcesForAuditFinding for usage and error information. +// +// Returned Error Types: +// +// - ResourceNotFoundException +// The specified resource does not exist. +// +// - InvalidRequestException +// The request is not valid. +// +// - ThrottlingException +// The rate exceeds the limit. +// +// - InternalFailureException +// An unexpected error has occurred. +func (c *IoT) ListRelatedResourcesForAuditFinding(input *ListRelatedResourcesForAuditFindingInput) (*ListRelatedResourcesForAuditFindingOutput, error) { + req, out := c.ListRelatedResourcesForAuditFindingRequest(input) + return out, req.Send() +} + +// ListRelatedResourcesForAuditFindingWithContext is the same as ListRelatedResourcesForAuditFinding with the addition of +// the ability to pass a context and additional request options. +// +// See ListRelatedResourcesForAuditFinding for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *IoT) ListRelatedResourcesForAuditFindingWithContext(ctx aws.Context, input *ListRelatedResourcesForAuditFindingInput, opts ...request.Option) (*ListRelatedResourcesForAuditFindingOutput, error) { + req, out := c.ListRelatedResourcesForAuditFindingRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opListRoleAliases = "ListRoleAliases" // ListRoleAliasesRequest generates a "aws/request.Request" representing the @@ -19394,7 +19504,9 @@ func (c *IoT) ListThingsRequest(input *ListThingsInput) (req *request.Request, o // Lists your things. Use the attributeName and attributeValue parameters to // filter your things. For example, calling ListThings with attributeName=Color // and attributeValue=Red retrieves all things in the registry that contain -// an attribute Color with the value Red. +// an attribute Color with the value Red. For more information, see List Things +// (https://docs.aws.amazon.com/iot/latest/developerguide/thing-registry.html#list-things) +// from the Amazon Web Services IoT Core Developer Guide. // // Requires permission to access the ListThings (https://docs.aws.amazon.com/service-authorization/latest/reference/list_awsiot.html#awsiot-actions-as-permissions) // action. @@ -46679,6 +46791,56 @@ func (s *IotSiteWiseAction) SetRoleArn(v string) *IotSiteWiseAction { return s } +// The certificate issuer indentifier. +type IssuerCertificateIdentifier struct { + _ struct{} `type:"structure"` + + // The issuer certificate serial number. + IssuerCertificateSerialNumber *string `locationName:"issuerCertificateSerialNumber" type:"string"` + + // The subject of the issuer certificate. + IssuerCertificateSubject *string `locationName:"issuerCertificateSubject" type:"string"` + + // The issuer ID. + IssuerId *string `locationName:"issuerId" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s IssuerCertificateIdentifier) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s IssuerCertificateIdentifier) GoString() string { + return s.String() +} + +// SetIssuerCertificateSerialNumber sets the IssuerCertificateSerialNumber field's value. +func (s *IssuerCertificateIdentifier) SetIssuerCertificateSerialNumber(v string) *IssuerCertificateIdentifier { + s.IssuerCertificateSerialNumber = &v + return s +} + +// SetIssuerCertificateSubject sets the IssuerCertificateSubject field's value. +func (s *IssuerCertificateIdentifier) SetIssuerCertificateSubject(v string) *IssuerCertificateIdentifier { + s.IssuerCertificateSubject = &v + return s +} + +// SetIssuerId sets the IssuerId field's value. +func (s *IssuerCertificateIdentifier) SetIssuerId(v string) *IssuerCertificateIdentifier { + s.IssuerId = &v + return s +} + // The Job object contains details about a job. type Job struct { _ struct{} `type:"structure"` @@ -52172,6 +52334,118 @@ func (s *ListProvisioningTemplatesOutput) SetTemplates(v []*ProvisioningTemplate return s } +type ListRelatedResourcesForAuditFindingInput struct { + _ struct{} `type:"structure" nopayload:"true"` + + // The finding Id. + // + // FindingId is a required field + FindingId *string `location:"querystring" locationName:"findingId" min:"1" type:"string" required:"true"` + + // The maximum number of results to return at one time. + MaxResults *int64 `location:"querystring" locationName:"maxResults" min:"1" type:"integer"` + + // A token that can be used to retrieve the next set of results, or null if + // there are no additional results. + NextToken *string `location:"querystring" locationName:"nextToken" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListRelatedResourcesForAuditFindingInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListRelatedResourcesForAuditFindingInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListRelatedResourcesForAuditFindingInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListRelatedResourcesForAuditFindingInput"} + if s.FindingId == nil { + invalidParams.Add(request.NewErrParamRequired("FindingId")) + } + if s.FindingId != nil && len(*s.FindingId) < 1 { + invalidParams.Add(request.NewErrParamMinLen("FindingId", 1)) + } + if s.MaxResults != nil && *s.MaxResults < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetFindingId sets the FindingId field's value. +func (s *ListRelatedResourcesForAuditFindingInput) SetFindingId(v string) *ListRelatedResourcesForAuditFindingInput { + s.FindingId = &v + return s +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListRelatedResourcesForAuditFindingInput) SetMaxResults(v int64) *ListRelatedResourcesForAuditFindingInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListRelatedResourcesForAuditFindingInput) SetNextToken(v string) *ListRelatedResourcesForAuditFindingInput { + s.NextToken = &v + return s +} + +type ListRelatedResourcesForAuditFindingOutput struct { + _ struct{} `type:"structure"` + + // A token that can be used to retrieve the next set of results, or null for + // the first API call. + NextToken *string `locationName:"nextToken" type:"string"` + + // The related resources. + RelatedResources []*RelatedResource `locationName:"relatedResources" type:"list"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListRelatedResourcesForAuditFindingOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListRelatedResourcesForAuditFindingOutput) GoString() string { + return s.String() +} + +// SetNextToken sets the NextToken field's value. +func (s *ListRelatedResourcesForAuditFindingOutput) SetNextToken(v string) *ListRelatedResourcesForAuditFindingOutput { + s.NextToken = &v + return s +} + +// SetRelatedResources sets the RelatedResources field's value. +func (s *ListRelatedResourcesForAuditFindingOutput) SetRelatedResources(v []*RelatedResource) *ListRelatedResourcesForAuditFindingOutput { + s.RelatedResources = v + return s +} + type ListRoleAliasesInput struct { _ struct{} `type:"structure" nopayload:"true"` @@ -58344,12 +58618,18 @@ type ResourceIdentifier struct { // The ID of the Amazon Cognito identity pool. CognitoIdentityPoolId *string `locationName:"cognitoIdentityPoolId" type:"string"` + // The ARN of the identified device certificate. + DeviceCertificateArn *string `locationName:"deviceCertificateArn" type:"string"` + // The ID of the certificate attached to the resource. DeviceCertificateId *string `locationName:"deviceCertificateId" min:"64" type:"string"` // The ARN of the IAM role that has overly permissive actions. IamRoleArn *string `locationName:"iamRoleArn" min:"20" type:"string"` + // The issuer certificate identifier. + IssuerCertificateIdentifier *IssuerCertificateIdentifier `locationName:"issuerCertificateIdentifier" type:"structure"` + // The version of the policy associated with the resource. PolicyVersionIdentifier *PolicyVersionIdentifier `locationName:"policyVersionIdentifier" type:"structure"` @@ -58429,6 +58709,12 @@ func (s *ResourceIdentifier) SetCognitoIdentityPoolId(v string) *ResourceIdentif return s } +// SetDeviceCertificateArn sets the DeviceCertificateArn field's value. +func (s *ResourceIdentifier) SetDeviceCertificateArn(v string) *ResourceIdentifier { + s.DeviceCertificateArn = &v + return s +} + // SetDeviceCertificateId sets the DeviceCertificateId field's value. func (s *ResourceIdentifier) SetDeviceCertificateId(v string) *ResourceIdentifier { s.DeviceCertificateId = &v @@ -58441,6 +58727,12 @@ func (s *ResourceIdentifier) SetIamRoleArn(v string) *ResourceIdentifier { return s } +// SetIssuerCertificateIdentifier sets the IssuerCertificateIdentifier field's value. +func (s *ResourceIdentifier) SetIssuerCertificateIdentifier(v *IssuerCertificateIdentifier) *ResourceIdentifier { + s.IssuerCertificateIdentifier = v + return s +} + // SetPolicyVersionIdentifier sets the PolicyVersionIdentifier field's value. func (s *ResourceIdentifier) SetPolicyVersionIdentifier(v *PolicyVersionIdentifier) *ResourceIdentifier { s.PolicyVersionIdentifier = v @@ -69398,6 +69690,9 @@ const ( // ResourceTypeIamRole is a ResourceType enum value ResourceTypeIamRole = "IAM_ROLE" + + // ResourceTypeIssuerCertificate is a ResourceType enum value + ResourceTypeIssuerCertificate = "ISSUER_CERTIFICATE" ) // ResourceType_Values returns all elements of the ResourceType enum @@ -69411,6 +69706,7 @@ func ResourceType_Values() []string { ResourceTypeAccountSettings, ResourceTypeRoleAlias, ResourceTypeIamRole, + ResourceTypeIssuerCertificate, } } diff --git a/service/iot/iotiface/interface.go b/service/iot/iotiface/interface.go index c135966ff66..7ed590ffccc 100644 --- a/service/iot/iotiface/interface.go +++ b/service/iot/iotiface/interface.go @@ -826,6 +826,10 @@ type IoTAPI interface { ListProvisioningTemplatesPages(*iot.ListProvisioningTemplatesInput, func(*iot.ListProvisioningTemplatesOutput, bool) bool) error ListProvisioningTemplatesPagesWithContext(aws.Context, *iot.ListProvisioningTemplatesInput, func(*iot.ListProvisioningTemplatesOutput, bool) bool, ...request.Option) error + ListRelatedResourcesForAuditFinding(*iot.ListRelatedResourcesForAuditFindingInput) (*iot.ListRelatedResourcesForAuditFindingOutput, error) + ListRelatedResourcesForAuditFindingWithContext(aws.Context, *iot.ListRelatedResourcesForAuditFindingInput, ...request.Option) (*iot.ListRelatedResourcesForAuditFindingOutput, error) + ListRelatedResourcesForAuditFindingRequest(*iot.ListRelatedResourcesForAuditFindingInput) (*request.Request, *iot.ListRelatedResourcesForAuditFindingOutput) + ListRoleAliases(*iot.ListRoleAliasesInput) (*iot.ListRoleAliasesOutput, error) ListRoleAliasesWithContext(aws.Context, *iot.ListRoleAliasesInput, ...request.Option) (*iot.ListRoleAliasesOutput, error) ListRoleAliasesRequest(*iot.ListRoleAliasesInput) (*request.Request, *iot.ListRoleAliasesOutput) diff --git a/service/licensemanager/api.go b/service/licensemanager/api.go index 2500c73f34b..f5ab0b0b79f 100644 --- a/service/licensemanager/api.go +++ b/service/licensemanager/api.go @@ -370,6 +370,9 @@ func (c *LicenseManager) CheckoutLicenseRequest(input *CheckoutLicenseInput) (re // // Checks out the specified license. // +// If the account that created the license is the same that is performing the +// check out, you must specify the account as the beneficiary. +// // Returns awserr.Error for service API and SDK errors. Use runtime type assertions // with awserr.Error's Code and Message methods to get detailed information about // the error. @@ -3538,6 +3541,104 @@ func (c *LicenseManager) ListReceivedGrantsWithContext(ctx aws.Context, input *L return out, req.Send() } +const opListReceivedGrantsForOrganization = "ListReceivedGrantsForOrganization" + +// ListReceivedGrantsForOrganizationRequest generates a "aws/request.Request" representing the +// client's request for the ListReceivedGrantsForOrganization operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See ListReceivedGrantsForOrganization for more information on using the ListReceivedGrantsForOrganization +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the ListReceivedGrantsForOrganizationRequest method. +// req, resp := client.ListReceivedGrantsForOrganizationRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/license-manager-2018-08-01/ListReceivedGrantsForOrganization +func (c *LicenseManager) ListReceivedGrantsForOrganizationRequest(input *ListReceivedGrantsForOrganizationInput) (req *request.Request, output *ListReceivedGrantsForOrganizationOutput) { + op := &request.Operation{ + Name: opListReceivedGrantsForOrganization, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ListReceivedGrantsForOrganizationInput{} + } + + output = &ListReceivedGrantsForOrganizationOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListReceivedGrantsForOrganization API operation for AWS License Manager. +// +// Lists the grants received for all accounts in the organization. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS License Manager's +// API operation ListReceivedGrantsForOrganization for usage and error information. +// +// Returned Error Types: +// +// - ValidationException +// The provided input is not valid. Try your request again. +// +// - InvalidParameterValueException +// One or more parameter values are not valid. +// +// - ResourceLimitExceededException +// Your resource limits have been exceeded. +// +// - ServerInternalException +// The server experienced an internal error. Try again. +// +// - AuthorizationException +// The Amazon Web Services user account does not have permission to perform +// the action. Check the IAM policy associated with this account. +// +// - AccessDeniedException +// Access to resource denied. +// +// - RateLimitExceededException +// Too many requests have been submitted. Try again after a brief wait. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/license-manager-2018-08-01/ListReceivedGrantsForOrganization +func (c *LicenseManager) ListReceivedGrantsForOrganization(input *ListReceivedGrantsForOrganizationInput) (*ListReceivedGrantsForOrganizationOutput, error) { + req, out := c.ListReceivedGrantsForOrganizationRequest(input) + return out, req.Send() +} + +// ListReceivedGrantsForOrganizationWithContext is the same as ListReceivedGrantsForOrganization with the addition of +// the ability to pass a context and additional request options. +// +// See ListReceivedGrantsForOrganization for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *LicenseManager) ListReceivedGrantsForOrganizationWithContext(ctx aws.Context, input *ListReceivedGrantsForOrganizationInput, opts ...request.Option) (*ListReceivedGrantsForOrganizationOutput, error) { + req, out := c.ListReceivedGrantsForOrganizationRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opListReceivedLicenses = "ListReceivedLicenses" // ListReceivedLicensesRequest generates a "aws/request.Request" representing the @@ -3636,6 +3737,104 @@ func (c *LicenseManager) ListReceivedLicensesWithContext(ctx aws.Context, input return out, req.Send() } +const opListReceivedLicensesForOrganization = "ListReceivedLicensesForOrganization" + +// ListReceivedLicensesForOrganizationRequest generates a "aws/request.Request" representing the +// client's request for the ListReceivedLicensesForOrganization operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See ListReceivedLicensesForOrganization for more information on using the ListReceivedLicensesForOrganization +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the ListReceivedLicensesForOrganizationRequest method. +// req, resp := client.ListReceivedLicensesForOrganizationRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/license-manager-2018-08-01/ListReceivedLicensesForOrganization +func (c *LicenseManager) ListReceivedLicensesForOrganizationRequest(input *ListReceivedLicensesForOrganizationInput) (req *request.Request, output *ListReceivedLicensesForOrganizationOutput) { + op := &request.Operation{ + Name: opListReceivedLicensesForOrganization, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &ListReceivedLicensesForOrganizationInput{} + } + + output = &ListReceivedLicensesForOrganizationOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListReceivedLicensesForOrganization API operation for AWS License Manager. +// +// Lists the licenses received for all accounts in the organization. +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS License Manager's +// API operation ListReceivedLicensesForOrganization for usage and error information. +// +// Returned Error Types: +// +// - ValidationException +// The provided input is not valid. Try your request again. +// +// - InvalidParameterValueException +// One or more parameter values are not valid. +// +// - ResourceLimitExceededException +// Your resource limits have been exceeded. +// +// - ServerInternalException +// The server experienced an internal error. Try again. +// +// - AuthorizationException +// The Amazon Web Services user account does not have permission to perform +// the action. Check the IAM policy associated with this account. +// +// - AccessDeniedException +// Access to resource denied. +// +// - RateLimitExceededException +// Too many requests have been submitted. Try again after a brief wait. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/license-manager-2018-08-01/ListReceivedLicensesForOrganization +func (c *LicenseManager) ListReceivedLicensesForOrganization(input *ListReceivedLicensesForOrganizationInput) (*ListReceivedLicensesForOrganizationOutput, error) { + req, out := c.ListReceivedLicensesForOrganizationRequest(input) + return out, req.Send() +} + +// ListReceivedLicensesForOrganizationWithContext is the same as ListReceivedLicensesForOrganization with the addition of +// the ability to pass a context and additional request options. +// +// See ListReceivedLicensesForOrganization for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *LicenseManager) ListReceivedLicensesForOrganizationWithContext(ctx aws.Context, input *ListReceivedLicensesForOrganizationInput, opts ...request.Option) (*ListReceivedLicensesForOrganizationOutput, error) { + req, out := c.ListReceivedLicensesForOrganizationRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opListResourceInventory = "ListResourceInventory" // ListResourceInventoryRequest generates a "aws/request.Request" representing the @@ -5738,7 +5937,8 @@ type CreateGrantInput struct { // LicenseArn is a required field LicenseArn *string `type:"string" required:"true"` - // The grant principals. + // The grant principals. This value should be specified as an Amazon Resource + // Name (ARN). // // Principals is a required field Principals []*string `min:"1" type:"list" required:"true"` @@ -6227,7 +6427,7 @@ type CreateLicenseConversionTaskForResourceInput struct { // Information that identifies the license type you are converting to. For the // structure of the destination license, see Convert a license type using the - // AWS CLI (https://docs.aws.amazon.com/license-manager/latest/userguide/conversion-procedures.html#conversion-cli) + // Amazon Web Services CLI (https://docs.aws.amazon.com/license-manager/latest/userguide/conversion-procedures.html#conversion-cli) // in the License Manager User Guide. // // DestinationLicenseContext is a required field @@ -6241,7 +6441,7 @@ type CreateLicenseConversionTaskForResourceInput struct { // Information that identifies the license type you are converting from. For // the structure of the source license, see Convert a license type using the - // AWS CLI (https://docs.aws.amazon.com/license-manager/latest/userguide/conversion-procedures.html#conversion-cli) + // Amazon Web Services CLI (https://docs.aws.amazon.com/license-manager/latest/userguide/conversion-procedures.html#conversion-cli) // in the License Manager User Guide. // // SourceLicenseContext is a required field @@ -11501,6 +11701,126 @@ func (s *ListLicensesOutput) SetNextToken(v string) *ListLicensesOutput { return s } +type ListReceivedGrantsForOrganizationInput struct { + _ struct{} `type:"structure"` + + // Filters to scope the results. The following filters are supported: + // + // * ParentArn + // + // * GranteePrincipalArn + Filters []*Filter `type:"list"` + + // The Amazon Resource Name (ARN) of the received license. + // + // LicenseArn is a required field + LicenseArn *string `type:"string" required:"true"` + + // Maximum number of results to return in a single call. + MaxResults *int64 `min:"1" type:"integer"` + + // Token for the next set of results. + NextToken *string `type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListReceivedGrantsForOrganizationInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListReceivedGrantsForOrganizationInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListReceivedGrantsForOrganizationInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListReceivedGrantsForOrganizationInput"} + if s.LicenseArn == nil { + invalidParams.Add(request.NewErrParamRequired("LicenseArn")) + } + if s.MaxResults != nil && *s.MaxResults < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetFilters sets the Filters field's value. +func (s *ListReceivedGrantsForOrganizationInput) SetFilters(v []*Filter) *ListReceivedGrantsForOrganizationInput { + s.Filters = v + return s +} + +// SetLicenseArn sets the LicenseArn field's value. +func (s *ListReceivedGrantsForOrganizationInput) SetLicenseArn(v string) *ListReceivedGrantsForOrganizationInput { + s.LicenseArn = &v + return s +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListReceivedGrantsForOrganizationInput) SetMaxResults(v int64) *ListReceivedGrantsForOrganizationInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListReceivedGrantsForOrganizationInput) SetNextToken(v string) *ListReceivedGrantsForOrganizationInput { + s.NextToken = &v + return s +} + +type ListReceivedGrantsForOrganizationOutput struct { + _ struct{} `type:"structure"` + + // Lists the grants the organization has received. + Grants []*Grant `type:"list"` + + // Token for the next set of results. + NextToken *string `type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListReceivedGrantsForOrganizationOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListReceivedGrantsForOrganizationOutput) GoString() string { + return s.String() +} + +// SetGrants sets the Grants field's value. +func (s *ListReceivedGrantsForOrganizationOutput) SetGrants(v []*Grant) *ListReceivedGrantsForOrganizationOutput { + s.Grants = v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListReceivedGrantsForOrganizationOutput) SetNextToken(v string) *ListReceivedGrantsForOrganizationOutput { + s.NextToken = &v + return s +} + type ListReceivedGrantsInput struct { _ struct{} `type:"structure"` @@ -11622,6 +11942,112 @@ func (s *ListReceivedGrantsOutput) SetNextToken(v string) *ListReceivedGrantsOut return s } +type ListReceivedLicensesForOrganizationInput struct { + _ struct{} `type:"structure"` + + // Filters to scope the results. The following filters are supported: + // + // * Beneficiary + // + // * ProductSKU + Filters []*Filter `type:"list"` + + // Maximum number of results to return in a single call. + MaxResults *int64 `min:"1" type:"integer"` + + // Token for the next set of results. + NextToken *string `type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListReceivedLicensesForOrganizationInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListReceivedLicensesForOrganizationInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListReceivedLicensesForOrganizationInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListReceivedLicensesForOrganizationInput"} + if s.MaxResults != nil && *s.MaxResults < 1 { + invalidParams.Add(request.NewErrParamMinValue("MaxResults", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetFilters sets the Filters field's value. +func (s *ListReceivedLicensesForOrganizationInput) SetFilters(v []*Filter) *ListReceivedLicensesForOrganizationInput { + s.Filters = v + return s +} + +// SetMaxResults sets the MaxResults field's value. +func (s *ListReceivedLicensesForOrganizationInput) SetMaxResults(v int64) *ListReceivedLicensesForOrganizationInput { + s.MaxResults = &v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListReceivedLicensesForOrganizationInput) SetNextToken(v string) *ListReceivedLicensesForOrganizationInput { + s.NextToken = &v + return s +} + +type ListReceivedLicensesForOrganizationOutput struct { + _ struct{} `type:"structure"` + + // Lists the licenses the organization has received. + Licenses []*GrantedLicense `type:"list"` + + // Token for the next set of results. + NextToken *string `type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListReceivedLicensesForOrganizationOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListReceivedLicensesForOrganizationOutput) GoString() string { + return s.String() +} + +// SetLicenses sets the Licenses field's value. +func (s *ListReceivedLicensesForOrganizationOutput) SetLicenses(v []*GrantedLicense) *ListReceivedLicensesForOrganizationOutput { + s.Licenses = v + return s +} + +// SetNextToken sets the NextToken field's value. +func (s *ListReceivedLicensesForOrganizationOutput) SetNextToken(v string) *ListReceivedLicensesForOrganizationOutput { + s.NextToken = &v + return s +} + type ListReceivedLicensesInput struct { _ struct{} `type:"structure"` diff --git a/service/licensemanager/licensemanageriface/interface.go b/service/licensemanager/licensemanageriface/interface.go index ed4ac823d59..6757fb7836d 100644 --- a/service/licensemanager/licensemanageriface/interface.go +++ b/service/licensemanager/licensemanageriface/interface.go @@ -204,10 +204,18 @@ type LicenseManagerAPI interface { ListReceivedGrantsWithContext(aws.Context, *licensemanager.ListReceivedGrantsInput, ...request.Option) (*licensemanager.ListReceivedGrantsOutput, error) ListReceivedGrantsRequest(*licensemanager.ListReceivedGrantsInput) (*request.Request, *licensemanager.ListReceivedGrantsOutput) + ListReceivedGrantsForOrganization(*licensemanager.ListReceivedGrantsForOrganizationInput) (*licensemanager.ListReceivedGrantsForOrganizationOutput, error) + ListReceivedGrantsForOrganizationWithContext(aws.Context, *licensemanager.ListReceivedGrantsForOrganizationInput, ...request.Option) (*licensemanager.ListReceivedGrantsForOrganizationOutput, error) + ListReceivedGrantsForOrganizationRequest(*licensemanager.ListReceivedGrantsForOrganizationInput) (*request.Request, *licensemanager.ListReceivedGrantsForOrganizationOutput) + ListReceivedLicenses(*licensemanager.ListReceivedLicensesInput) (*licensemanager.ListReceivedLicensesOutput, error) ListReceivedLicensesWithContext(aws.Context, *licensemanager.ListReceivedLicensesInput, ...request.Option) (*licensemanager.ListReceivedLicensesOutput, error) ListReceivedLicensesRequest(*licensemanager.ListReceivedLicensesInput) (*request.Request, *licensemanager.ListReceivedLicensesOutput) + ListReceivedLicensesForOrganization(*licensemanager.ListReceivedLicensesForOrganizationInput) (*licensemanager.ListReceivedLicensesForOrganizationOutput, error) + ListReceivedLicensesForOrganizationWithContext(aws.Context, *licensemanager.ListReceivedLicensesForOrganizationInput, ...request.Option) (*licensemanager.ListReceivedLicensesForOrganizationOutput, error) + ListReceivedLicensesForOrganizationRequest(*licensemanager.ListReceivedLicensesForOrganizationInput) (*request.Request, *licensemanager.ListReceivedLicensesForOrganizationOutput) + ListResourceInventory(*licensemanager.ListResourceInventoryInput) (*licensemanager.ListResourceInventoryOutput, error) ListResourceInventoryWithContext(aws.Context, *licensemanager.ListResourceInventoryInput, ...request.Option) (*licensemanager.ListResourceInventoryOutput, error) ListResourceInventoryRequest(*licensemanager.ListResourceInventoryInput) (*request.Request, *licensemanager.ListResourceInventoryOutput) diff --git a/service/marketplacecatalog/api.go b/service/marketplacecatalog/api.go index 0752700b807..8a6c11a5d7b 100644 --- a/service/marketplacecatalog/api.go +++ b/service/marketplacecatalog/api.go @@ -9,6 +9,7 @@ import ( "github.com/aws/aws-sdk-go/aws/awsutil" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/private/protocol" + "github.com/aws/aws-sdk-go/private/protocol/restjson" ) const opCancelChangeSet = "CancelChangeSet" @@ -592,6 +593,98 @@ func (c *MarketplaceCatalog) ListEntitiesPagesWithContext(ctx aws.Context, input return p.Err() } +const opListTagsForResource = "ListTagsForResource" + +// ListTagsForResourceRequest generates a "aws/request.Request" representing the +// client's request for the ListTagsForResource operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See ListTagsForResource for more information on using the ListTagsForResource +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the ListTagsForResourceRequest method. +// req, resp := client.ListTagsForResourceRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/marketplace-catalog-2018-09-17/ListTagsForResource +func (c *MarketplaceCatalog) ListTagsForResourceRequest(input *ListTagsForResourceInput) (req *request.Request, output *ListTagsForResourceOutput) { + op := &request.Operation{ + Name: opListTagsForResource, + HTTPMethod: "POST", + HTTPPath: "/ListTagsForResource", + } + + if input == nil { + input = &ListTagsForResourceInput{} + } + + output = &ListTagsForResourceOutput{} + req = c.newRequest(op, input, output) + return +} + +// ListTagsForResource API operation for AWS Marketplace Catalog Service. +// +// Lists all tags that have been added to a resource (either an entity (https://docs.aws.amazon.com/marketplace-catalog/latest/api-reference/welcome.html#catalog-api-entities) +// or change set (https://docs.aws.amazon.com/marketplace-catalog/latest/api-reference/welcome.html#working-with-change-sets)). +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS Marketplace Catalog Service's +// API operation ListTagsForResource for usage and error information. +// +// Returned Error Types: +// +// - ResourceNotFoundException +// The specified resource wasn't found. +// +// - InternalServiceException +// There was an internal service exception. +// +// - AccessDeniedException +// Access is denied. +// +// - ValidationException +// An error occurred during validation. +// +// - ThrottlingException +// Too many requests. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/marketplace-catalog-2018-09-17/ListTagsForResource +func (c *MarketplaceCatalog) ListTagsForResource(input *ListTagsForResourceInput) (*ListTagsForResourceOutput, error) { + req, out := c.ListTagsForResourceRequest(input) + return out, req.Send() +} + +// ListTagsForResourceWithContext is the same as ListTagsForResource with the addition of +// the ability to pass a context and additional request options. +// +// See ListTagsForResource for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *MarketplaceCatalog) ListTagsForResourceWithContext(ctx aws.Context, input *ListTagsForResourceInput, opts ...request.Option) (*ListTagsForResourceOutput, error) { + req, out := c.ListTagsForResourceRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opStartChangeSet = "StartChangeSet" // StartChangeSetRequest generates a "aws/request.Request" representing the @@ -635,17 +728,17 @@ func (c *MarketplaceCatalog) StartChangeSetRequest(input *StartChangeSetInput) ( // StartChangeSet API operation for AWS Marketplace Catalog Service. // -// This operation allows you to request changes for your entities. Within a -// single ChangeSet, you cannot start the same change type against the same -// entity multiple times. Additionally, when a ChangeSet is running, all the -// entities targeted by the different changes are locked until the ChangeSet -// has completed (either succeeded, cancelled, or failed). If you try to start -// a ChangeSet containing a change against an entity that is already locked, -// you will receive a ResourceInUseException. +// Allows you to request changes for your entities. Within a single ChangeSet, +// you can't start the same change type against the same entity multiple times. +// Additionally, when a ChangeSet is running, all the entities targeted by the +// different changes are locked until the change set has completed (either succeeded, +// cancelled, or failed). If you try to start a change set containing a change +// against an entity that is already locked, you will receive a ResourceInUseException +// error. // -// For example, you cannot start the ChangeSet described in the example (https://docs.aws.amazon.com/marketplace-catalog/latest/api-reference/API_StartChangeSet.html#API_StartChangeSet_Examples) -// later in this topic, because it contains two changes to execute the same -// change type (AddRevisions) against the same entity (entity-id@1). +// For example, you can't start the ChangeSet described in the example (https://docs.aws.amazon.com/marketplace-catalog/latest/api-reference/API_StartChangeSet.html#API_StartChangeSet_Examples) +// later in this topic because it contains two changes to run the same change +// type (AddRevisions) against the same entity (entity-id@1). // // For more information about working with change sets, see Working with change // sets (https://docs.aws.amazon.com/marketplace-catalog/latest/api-reference/welcome.html#working-with-change-sets). @@ -702,6 +795,192 @@ func (c *MarketplaceCatalog) StartChangeSetWithContext(ctx aws.Context, input *S return out, req.Send() } +const opTagResource = "TagResource" + +// TagResourceRequest generates a "aws/request.Request" representing the +// client's request for the TagResource operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See TagResource for more information on using the TagResource +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the TagResourceRequest method. +// req, resp := client.TagResourceRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/marketplace-catalog-2018-09-17/TagResource +func (c *MarketplaceCatalog) TagResourceRequest(input *TagResourceInput) (req *request.Request, output *TagResourceOutput) { + op := &request.Operation{ + Name: opTagResource, + HTTPMethod: "POST", + HTTPPath: "/TagResource", + } + + if input == nil { + input = &TagResourceInput{} + } + + output = &TagResourceOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(restjson.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// TagResource API operation for AWS Marketplace Catalog Service. +// +// Tags a resource (either an entity (https://docs.aws.amazon.com/marketplace-catalog/latest/api-reference/welcome.html#catalog-api-entities) +// or change set (https://docs.aws.amazon.com/marketplace-catalog/latest/api-reference/welcome.html#working-with-change-sets)). +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS Marketplace Catalog Service's +// API operation TagResource for usage and error information. +// +// Returned Error Types: +// +// - ResourceNotFoundException +// The specified resource wasn't found. +// +// - InternalServiceException +// There was an internal service exception. +// +// - AccessDeniedException +// Access is denied. +// +// - ValidationException +// An error occurred during validation. +// +// - ThrottlingException +// Too many requests. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/marketplace-catalog-2018-09-17/TagResource +func (c *MarketplaceCatalog) TagResource(input *TagResourceInput) (*TagResourceOutput, error) { + req, out := c.TagResourceRequest(input) + return out, req.Send() +} + +// TagResourceWithContext is the same as TagResource with the addition of +// the ability to pass a context and additional request options. +// +// See TagResource for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *MarketplaceCatalog) TagResourceWithContext(ctx aws.Context, input *TagResourceInput, opts ...request.Option) (*TagResourceOutput, error) { + req, out := c.TagResourceRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + +const opUntagResource = "UntagResource" + +// UntagResourceRequest generates a "aws/request.Request" representing the +// client's request for the UntagResource operation. The "output" return +// value will be populated with the request's response once the request completes +// successfully. +// +// Use "Send" method on the returned Request to send the API call to the service. +// the "output" return value is not valid until after Send returns without error. +// +// See UntagResource for more information on using the UntagResource +// API call, and error handling. +// +// This method is useful when you want to inject custom logic or configuration +// into the SDK's request lifecycle. Such as custom headers, or retry logic. +// +// // Example sending a request using the UntagResourceRequest method. +// req, resp := client.UntagResourceRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/marketplace-catalog-2018-09-17/UntagResource +func (c *MarketplaceCatalog) UntagResourceRequest(input *UntagResourceInput) (req *request.Request, output *UntagResourceOutput) { + op := &request.Operation{ + Name: opUntagResource, + HTTPMethod: "POST", + HTTPPath: "/UntagResource", + } + + if input == nil { + input = &UntagResourceInput{} + } + + output = &UntagResourceOutput{} + req = c.newRequest(op, input, output) + req.Handlers.Unmarshal.Swap(restjson.UnmarshalHandler.Name, protocol.UnmarshalDiscardBodyHandler) + return +} + +// UntagResource API operation for AWS Marketplace Catalog Service. +// +// Removes a tag or list of tags from a resource (either an entity (https://docs.aws.amazon.com/marketplace-catalog/latest/api-reference/welcome.html#catalog-api-entities) +// or change set (https://docs.aws.amazon.com/marketplace-catalog/latest/api-reference/welcome.html#working-with-change-sets)). +// +// Returns awserr.Error for service API and SDK errors. Use runtime type assertions +// with awserr.Error's Code and Message methods to get detailed information about +// the error. +// +// See the AWS API reference guide for AWS Marketplace Catalog Service's +// API operation UntagResource for usage and error information. +// +// Returned Error Types: +// +// - ResourceNotFoundException +// The specified resource wasn't found. +// +// - InternalServiceException +// There was an internal service exception. +// +// - AccessDeniedException +// Access is denied. +// +// - ValidationException +// An error occurred during validation. +// +// - ThrottlingException +// Too many requests. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/marketplace-catalog-2018-09-17/UntagResource +func (c *MarketplaceCatalog) UntagResource(input *UntagResourceInput) (*UntagResourceOutput, error) { + req, out := c.UntagResourceRequest(input) + return out, req.Send() +} + +// UntagResourceWithContext is the same as UntagResource with the addition of +// the ability to pass a context and additional request options. +// +// See UntagResource for details on how to use this API operation. +// +// The context must be non-nil and will be used for request cancellation. If +// the context is nil a panic will occur. In the future the SDK may create +// sub-contexts for http.Requests. See https://golang.org/pkg/context/ +// for more information on using Contexts. +func (c *MarketplaceCatalog) UntagResourceWithContext(ctx aws.Context, input *UntagResourceInput, opts ...request.Option) (*UntagResourceOutput, error) { + req, out := c.UntagResourceRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + // Access is denied. type AccessDeniedException struct { _ struct{} `type:"structure"` @@ -897,6 +1176,9 @@ type Change struct { // // Entity is a required field Entity *Entity `type:"structure" required:"true"` + + // The tags associated with the change. + EntityTags []*Tag `min:"1" type:"list"` } // String returns the string representation. @@ -938,11 +1220,24 @@ func (s *Change) Validate() error { if s.Entity == nil { invalidParams.Add(request.NewErrParamRequired("Entity")) } + if s.EntityTags != nil && len(s.EntityTags) < 1 { + invalidParams.Add(request.NewErrParamMinLen("EntityTags", 1)) + } if s.Entity != nil { if err := s.Entity.Validate(); err != nil { invalidParams.AddNested("Entity", err.(request.ErrInvalidParams)) } } + if s.EntityTags != nil { + for i, v := range s.EntityTags { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "EntityTags", i), err.(request.ErrInvalidParams)) + } + } + } if invalidParams.Len() > 0 { return invalidParams @@ -974,6 +1269,12 @@ func (s *Change) SetEntity(v *Entity) *Change { return s } +// SetEntityTags sets the EntityTags field's value. +func (s *Change) SetEntityTags(v []*Tag) *Change { + s.EntityTags = v + return s +} + // A summary of a change set returned in a list of change sets when the ListChangeSets // action is called. type ChangeSetSummaryListItem struct { @@ -2114,6 +2415,97 @@ func (s *ListEntitiesOutput) SetNextToken(v string) *ListEntitiesOutput { return s } +type ListTagsForResourceInput struct { + _ struct{} `type:"structure"` + + // Required. The Amazon Resource Name (ARN) associated with the resource you + // want to list tags on. + // + // ResourceArn is a required field + ResourceArn *string `min:"1" type:"string" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListTagsForResourceInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListTagsForResourceInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ListTagsForResourceInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ListTagsForResourceInput"} + if s.ResourceArn == nil { + invalidParams.Add(request.NewErrParamRequired("ResourceArn")) + } + if s.ResourceArn != nil && len(*s.ResourceArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ResourceArn", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetResourceArn sets the ResourceArn field's value. +func (s *ListTagsForResourceInput) SetResourceArn(v string) *ListTagsForResourceInput { + s.ResourceArn = &v + return s +} + +type ListTagsForResourceOutput struct { + _ struct{} `type:"structure"` + + // Required. The ARN associated with the resource you want to list tags on. + ResourceArn *string `min:"1" type:"string"` + + // Required. A list of objects specifying each key name and value. Number of + // objects allowed: 1-50. + Tags []*Tag `min:"1" type:"list"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListTagsForResourceOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s ListTagsForResourceOutput) GoString() string { + return s.String() +} + +// SetResourceArn sets the ResourceArn field's value. +func (s *ListTagsForResourceOutput) SetResourceArn(v string) *ListTagsForResourceOutput { + s.ResourceArn = &v + return s +} + +// SetTags sets the Tags field's value. +func (s *ListTagsForResourceOutput) SetTags(v []*Tag) *ListTagsForResourceOutput { + s.Tags = v + return s +} + // The resource is currently in use. type ResourceInUseException struct { _ struct{} `type:"structure"` @@ -2444,6 +2836,10 @@ type StartChangeSetInput struct { // set name can be used to filter the list of change sets. ChangeSetName *string `min:"1" type:"string"` + // A list of objects specifying each key name and value for the ChangeSetTags + // property. + ChangeSetTags []*Tag `min:"1" type:"list"` + // A unique token to identify the request to ensure idempotency. ClientRequestToken *string `min:"1" type:"string" idempotencyToken:"true"` } @@ -2484,6 +2880,9 @@ func (s *StartChangeSetInput) Validate() error { if s.ChangeSetName != nil && len(*s.ChangeSetName) < 1 { invalidParams.Add(request.NewErrParamMinLen("ChangeSetName", 1)) } + if s.ChangeSetTags != nil && len(s.ChangeSetTags) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ChangeSetTags", 1)) + } if s.ClientRequestToken != nil && len(*s.ClientRequestToken) < 1 { invalidParams.Add(request.NewErrParamMinLen("ClientRequestToken", 1)) } @@ -2497,6 +2896,16 @@ func (s *StartChangeSetInput) Validate() error { } } } + if s.ChangeSetTags != nil { + for i, v := range s.ChangeSetTags { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "ChangeSetTags", i), err.(request.ErrInvalidParams)) + } + } + } if invalidParams.Len() > 0 { return invalidParams @@ -2522,6 +2931,12 @@ func (s *StartChangeSetInput) SetChangeSetName(v string) *StartChangeSetInput { return s } +// SetChangeSetTags sets the ChangeSetTags field's value. +func (s *StartChangeSetInput) SetChangeSetTags(v []*Tag) *StartChangeSetInput { + s.ChangeSetTags = v + return s +} + // SetClientRequestToken sets the ClientRequestToken field's value. func (s *StartChangeSetInput) SetClientRequestToken(v string) *StartChangeSetInput { s.ClientRequestToken = &v @@ -2568,6 +2983,170 @@ func (s *StartChangeSetOutput) SetChangeSetId(v string) *StartChangeSetOutput { return s } +// A list of objects specifying each key name and value. +type Tag struct { + _ struct{} `type:"structure"` + + // The key associated with the tag. + // + // Key is a required field + Key *string `min:"1" type:"string" required:"true"` + + // The value associated with the tag. + // + // Value is a required field + Value *string `type:"string" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s Tag) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s Tag) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *Tag) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "Tag"} + if s.Key == nil { + invalidParams.Add(request.NewErrParamRequired("Key")) + } + if s.Key != nil && len(*s.Key) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Key", 1)) + } + if s.Value == nil { + invalidParams.Add(request.NewErrParamRequired("Value")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetKey sets the Key field's value. +func (s *Tag) SetKey(v string) *Tag { + s.Key = &v + return s +} + +// SetValue sets the Value field's value. +func (s *Tag) SetValue(v string) *Tag { + s.Value = &v + return s +} + +type TagResourceInput struct { + _ struct{} `type:"structure"` + + // Required. The Amazon Resource Name (ARN) associated with the resource you + // want to tag. + // + // ResourceArn is a required field + ResourceArn *string `min:"1" type:"string" required:"true"` + + // Required. A list of objects specifying each key name and value. Number of + // objects allowed: 1-50. + // + // Tags is a required field + Tags []*Tag `min:"1" type:"list" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s TagResourceInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s TagResourceInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *TagResourceInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "TagResourceInput"} + if s.ResourceArn == nil { + invalidParams.Add(request.NewErrParamRequired("ResourceArn")) + } + if s.ResourceArn != nil && len(*s.ResourceArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ResourceArn", 1)) + } + if s.Tags == nil { + invalidParams.Add(request.NewErrParamRequired("Tags")) + } + if s.Tags != nil && len(s.Tags) < 1 { + invalidParams.Add(request.NewErrParamMinLen("Tags", 1)) + } + if s.Tags != nil { + for i, v := range s.Tags { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "Tags", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetResourceArn sets the ResourceArn field's value. +func (s *TagResourceInput) SetResourceArn(v string) *TagResourceInput { + s.ResourceArn = &v + return s +} + +// SetTags sets the Tags field's value. +func (s *TagResourceInput) SetTags(v []*Tag) *TagResourceInput { + s.Tags = v + return s +} + +type TagResourceOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s TagResourceOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s TagResourceOutput) GoString() string { + return s.String() +} + // Too many requests. type ThrottlingException struct { _ struct{} `type:"structure"` @@ -2632,6 +3211,96 @@ func (s *ThrottlingException) RequestID() string { return s.RespMetadata.RequestID } +type UntagResourceInput struct { + _ struct{} `type:"structure"` + + // Required. The Amazon Resource Name (ARN) associated with the resource you + // want to remove the tag from. + // + // ResourceArn is a required field + ResourceArn *string `min:"1" type:"string" required:"true"` + + // Required. A list of key names of tags to be removed. Number of strings allowed: + // 0-256. + // + // TagKeys is a required field + TagKeys []*string `min:"1" type:"list" required:"true"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s UntagResourceInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s UntagResourceInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *UntagResourceInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "UntagResourceInput"} + if s.ResourceArn == nil { + invalidParams.Add(request.NewErrParamRequired("ResourceArn")) + } + if s.ResourceArn != nil && len(*s.ResourceArn) < 1 { + invalidParams.Add(request.NewErrParamMinLen("ResourceArn", 1)) + } + if s.TagKeys == nil { + invalidParams.Add(request.NewErrParamRequired("TagKeys")) + } + if s.TagKeys != nil && len(s.TagKeys) < 1 { + invalidParams.Add(request.NewErrParamMinLen("TagKeys", 1)) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetResourceArn sets the ResourceArn field's value. +func (s *UntagResourceInput) SetResourceArn(v string) *UntagResourceInput { + s.ResourceArn = &v + return s +} + +// SetTagKeys sets the TagKeys field's value. +func (s *UntagResourceInput) SetTagKeys(v []*string) *UntagResourceInput { + s.TagKeys = v + return s +} + +type UntagResourceOutput struct { + _ struct{} `type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s UntagResourceOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s UntagResourceOutput) GoString() string { + return s.String() +} + // An error occurred during validation. type ValidationException struct { _ struct{} `type:"structure"` diff --git a/service/marketplacecatalog/marketplacecatalogiface/interface.go b/service/marketplacecatalog/marketplacecatalogiface/interface.go index aeab937ca03..7049f97ec56 100644 --- a/service/marketplacecatalog/marketplacecatalogiface/interface.go +++ b/service/marketplacecatalog/marketplacecatalogiface/interface.go @@ -86,9 +86,21 @@ type MarketplaceCatalogAPI interface { ListEntitiesPages(*marketplacecatalog.ListEntitiesInput, func(*marketplacecatalog.ListEntitiesOutput, bool) bool) error ListEntitiesPagesWithContext(aws.Context, *marketplacecatalog.ListEntitiesInput, func(*marketplacecatalog.ListEntitiesOutput, bool) bool, ...request.Option) error + ListTagsForResource(*marketplacecatalog.ListTagsForResourceInput) (*marketplacecatalog.ListTagsForResourceOutput, error) + ListTagsForResourceWithContext(aws.Context, *marketplacecatalog.ListTagsForResourceInput, ...request.Option) (*marketplacecatalog.ListTagsForResourceOutput, error) + ListTagsForResourceRequest(*marketplacecatalog.ListTagsForResourceInput) (*request.Request, *marketplacecatalog.ListTagsForResourceOutput) + StartChangeSet(*marketplacecatalog.StartChangeSetInput) (*marketplacecatalog.StartChangeSetOutput, error) StartChangeSetWithContext(aws.Context, *marketplacecatalog.StartChangeSetInput, ...request.Option) (*marketplacecatalog.StartChangeSetOutput, error) StartChangeSetRequest(*marketplacecatalog.StartChangeSetInput) (*request.Request, *marketplacecatalog.StartChangeSetOutput) + + TagResource(*marketplacecatalog.TagResourceInput) (*marketplacecatalog.TagResourceOutput, error) + TagResourceWithContext(aws.Context, *marketplacecatalog.TagResourceInput, ...request.Option) (*marketplacecatalog.TagResourceOutput, error) + TagResourceRequest(*marketplacecatalog.TagResourceInput) (*request.Request, *marketplacecatalog.TagResourceOutput) + + UntagResource(*marketplacecatalog.UntagResourceInput) (*marketplacecatalog.UntagResourceOutput, error) + UntagResourceWithContext(aws.Context, *marketplacecatalog.UntagResourceInput, ...request.Option) (*marketplacecatalog.UntagResourceOutput, error) + UntagResourceRequest(*marketplacecatalog.UntagResourceInput) (*request.Request, *marketplacecatalog.UntagResourceOutput) } var _ MarketplaceCatalogAPI = (*marketplacecatalog.MarketplaceCatalog)(nil) diff --git a/service/rekognition/api.go b/service/rekognition/api.go index 8039e2e7c7c..c207590b1a4 100644 --- a/service/rekognition/api.go +++ b/service/rekognition/api.go @@ -2580,20 +2580,79 @@ func (c *Rekognition) DetectLabelsRequest(input *DetectLabelsInput) (req *reques // For an example, see Analyzing images stored in an Amazon S3 bucket in the // Amazon Rekognition Developer Guide. // -// DetectLabels does not support the detection of activities. However, activity -// detection is supported for label detection in videos. For more information, -// see StartLabelDetection in the Amazon Rekognition Developer Guide. -// // You pass the input image as base64-encoded image bytes or as a reference // to an image in an Amazon S3 bucket. If you use the AWS CLI to call Amazon // Rekognition operations, passing image bytes is not supported. The image must // be either a PNG or JPEG formatted file. // -// For each object, scene, and concept the API returns one or more labels. Each -// label provides the object name, and the level of confidence that the image -// contains the object. For example, suppose the input image has a lighthouse, -// the sea, and a rock. The response includes all three labels, one for each -// object. +// # Optional Parameters +// +// You can specify one or both of the GENERAL_LABELS and IMAGE_PROPERTIES feature +// types when calling the DetectLabels API. Including GENERAL_LABELS will ensure +// the response includes the labels detected in the input image, while including +// IMAGE_PROPERTIES will ensure the response includes information about the +// image quality and color. +// +// When using GENERAL_LABELS and/or IMAGE_PROPERTIES you can provide filtering +// criteria to the Settings parameter. You can filter with sets of individual +// labels or with label categories. You can specify inclusive filters, exclusive +// filters, or a combination of inclusive and exclusive filters. For more information +// on filtering see Detecting Labels in an Image (https://docs.aws.amazon.com/rekognition/latest/dg/labels-detect-labels-image.html). +// +// You can specify MinConfidence to control the confidence threshold for the +// labels returned. The default is 55%. You can also add the MaxLabels parameter +// to limit the number of labels returned. The default and upper limit is 1000 +// labels. +// +// # Response Elements +// +// For each object, scene, and concept the API returns one or more labels. The +// API returns the following types of information regarding labels: +// +// - Name - The name of the detected label. +// +// - Confidence - The level of confidence in the label assigned to a detected +// object. +// +// - Parents - The ancestor labels for a detected label. DetectLabels returns +// a hierarchical taxonomy of detected labels. For example, a detected car +// might be assigned the label car. The label car has two parent labels: +// Vehicle (its parent) and Transportation (its grandparent). The response +// includes the all ancestors for a label, where every ancestor is a unique +// label. In the previous example, Car, Vehicle, and Transportation are returned +// as unique labels in the response. +// +// - Aliases - Possible Aliases for the label. +// +// - Categories - The label categories that the detected label belongs to. +// A given label can belong to more than one category. +// +// - BoundingBox — Bounding boxes are described for all instances of detected +// common object labels, returned in an array of Instance objects. An Instance +// object contains a BoundingBox object, describing the location of the label +// on the input image. It also includes the confidence for the accuracy of +// the detected bounding box. +// +// The API returns the following information regarding the image, as part of +// the ImageProperties structure: +// +// - Quality - Information about the Sharpness, Brightness, and Contrast +// of the input image, scored between 0 to 100. Image quality is returned +// for the entire image, as well as the background and the foreground. +// +// - Dominant Color - An array of the dominant colors in the image. +// +// - Foreground - Information about the Sharpness and Brightness of the input +// image’s foreground. +// +// - Background - Information about the Sharpness and Brightness of the input +// image’s background. +// +// The list of returned labels will include at least one label for every detected +// object, along with information about that label. In the following example, +// suppose the input image has a lighthouse, the sea, and a rock. The response +// includes all three labels, one for each object, as well as the confidence +// in the label: // // {Name: lighthouse, Confidence: 98.4629} // @@ -2601,10 +2660,9 @@ func (c *Rekognition) DetectLabelsRequest(input *DetectLabelsInput) (req *reques // // {Name: sea,Confidence: 75.061} // -// In the preceding example, the operation returns one label for each of the -// three objects. The operation can also return multiple labels for the same -// object in the image. For example, if the input image shows a flower (for -// example, a tulip), the operation might return the following three labels. +// The list of labels can include multiple labels for the same object. For example, +// if the input image shows a flower (for example, a tulip), the operation might +// return the following three labels. // // {Name: flower,Confidence: 99.0562} // @@ -2615,27 +2673,9 @@ func (c *Rekognition) DetectLabelsRequest(input *DetectLabelsInput) (req *reques // In this example, the detection algorithm more precisely identifies the flower // as a tulip. // -// In response, the API returns an array of labels. In addition, the response -// also includes the orientation correction. Optionally, you can specify MinConfidence -// to control the confidence threshold for the labels returned. The default -// is 55%. You can also add the MaxLabels parameter to limit the number of labels -// returned. -// // If the object detected is a person, the operation doesn't provide the same // facial details that the DetectFaces operation provides. // -// DetectLabels returns bounding boxes for instances of common object labels -// in an array of Instance objects. An Instance object contains a BoundingBox -// object, for the location of the label on the image. It also includes the -// confidence by which the bounding box was detected. -// -// DetectLabels also returns a hierarchical taxonomy of detected labels. For -// example, a detected car might be assigned the label car. The label car has -// two parent labels: Vehicle (its parent) and Transportation (its grandparent). -// The response returns the entire list of ancestors for a label. Each ancestor -// is a unique label in the response. In the previous example, Car, Vehicle, -// and Transportation are returned as unique labels in the response. -// // This is a stateless API operation. That is, the operation does not persist // any data. // @@ -8984,7 +9024,8 @@ type CelebrityRecognition struct { Celebrity *CelebrityDetail `type:"structure"` // The time, in milliseconds from the start of the video, that the celebrity - // was recognized. + // was recognized. Note that Timestamp is not guaranteed to be accurate to the + // individual frame where the celebrity first appears. Timestamp *int64 `type:"long"` } @@ -9540,7 +9581,8 @@ type ContentModerationDetection struct { ModerationLabel *ModerationLabel `type:"structure"` // Time, in milliseconds from the beginning of the video, that the content moderation - // label was detected. + // label was detected. Note that Timestamp is not guaranteed to be accurate + // to the individual frame where the moderated content first appears. Timestamp *int64 `type:"long"` } @@ -12551,9 +12593,253 @@ func (s *DetectFacesOutput) SetOrientationCorrection(v string) *DetectFacesOutpu return s } +// The background of the image with regard to image quality and dominant colors. +type DetectLabelsImageBackground struct { + _ struct{} `type:"structure"` + + // The dominant colors found in the background of an image, defined with RGB + // values, CSS color name, simplified color name, and PixelPercentage (the percentage + // of image pixels that have a particular color). + DominantColors []*DominantColor `type:"list"` + + // The quality of the image background as defined by brightness and sharpness. + Quality *DetectLabelsImageQuality `type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DetectLabelsImageBackground) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DetectLabelsImageBackground) GoString() string { + return s.String() +} + +// SetDominantColors sets the DominantColors field's value. +func (s *DetectLabelsImageBackground) SetDominantColors(v []*DominantColor) *DetectLabelsImageBackground { + s.DominantColors = v + return s +} + +// SetQuality sets the Quality field's value. +func (s *DetectLabelsImageBackground) SetQuality(v *DetectLabelsImageQuality) *DetectLabelsImageBackground { + s.Quality = v + return s +} + +// The foreground of the image with regard to image quality and dominant colors. +type DetectLabelsImageForeground struct { + _ struct{} `type:"structure"` + + // The dominant colors found in the foreground of an image, defined with RGB + // values, CSS color name, simplified color name, and PixelPercentage (the percentage + // of image pixels that have a particular color). + DominantColors []*DominantColor `type:"list"` + + // The quality of the image foreground as defined by brightness and sharpness. + Quality *DetectLabelsImageQuality `type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DetectLabelsImageForeground) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DetectLabelsImageForeground) GoString() string { + return s.String() +} + +// SetDominantColors sets the DominantColors field's value. +func (s *DetectLabelsImageForeground) SetDominantColors(v []*DominantColor) *DetectLabelsImageForeground { + s.DominantColors = v + return s +} + +// SetQuality sets the Quality field's value. +func (s *DetectLabelsImageForeground) SetQuality(v *DetectLabelsImageQuality) *DetectLabelsImageForeground { + s.Quality = v + return s +} + +// Information about the quality and dominant colors of an input image. Quality +// and color information is returned for the entire image, foreground, and background. +type DetectLabelsImageProperties struct { + _ struct{} `type:"structure"` + + // Information about the properties of an image’s background, including the + // background’s quality and dominant colors, including the quality and dominant + // colors of the image. + Background *DetectLabelsImageBackground `type:"structure"` + + // Information about the dominant colors found in an image, described with RGB + // values, CSS color name, simplified color name, and PixelPercentage (the percentage + // of image pixels that have a particular color). + DominantColors []*DominantColor `type:"list"` + + // Information about the properties of an image’s foreground, including the + // foreground’s quality and dominant colors, including the quality and dominant + // colors of the image. + Foreground *DetectLabelsImageForeground `type:"structure"` + + // Information about the quality of the image foreground as defined by brightness, + // sharpness, and contrast. The higher the value the greater the brightness, + // sharpness, and contrast respectively. + Quality *DetectLabelsImageQuality `type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DetectLabelsImageProperties) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DetectLabelsImageProperties) GoString() string { + return s.String() +} + +// SetBackground sets the Background field's value. +func (s *DetectLabelsImageProperties) SetBackground(v *DetectLabelsImageBackground) *DetectLabelsImageProperties { + s.Background = v + return s +} + +// SetDominantColors sets the DominantColors field's value. +func (s *DetectLabelsImageProperties) SetDominantColors(v []*DominantColor) *DetectLabelsImageProperties { + s.DominantColors = v + return s +} + +// SetForeground sets the Foreground field's value. +func (s *DetectLabelsImageProperties) SetForeground(v *DetectLabelsImageForeground) *DetectLabelsImageProperties { + s.Foreground = v + return s +} + +// SetQuality sets the Quality field's value. +func (s *DetectLabelsImageProperties) SetQuality(v *DetectLabelsImageQuality) *DetectLabelsImageProperties { + s.Quality = v + return s +} + +// Settings for the IMAGE_PROPERTIES feature type. +type DetectLabelsImagePropertiesSettings struct { + _ struct{} `type:"structure"` + + // The maximum number of dominant colors to return when detecting labels in + // an image. The default value is 10. + MaxDominantColors *int64 `type:"integer"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DetectLabelsImagePropertiesSettings) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DetectLabelsImagePropertiesSettings) GoString() string { + return s.String() +} + +// SetMaxDominantColors sets the MaxDominantColors field's value. +func (s *DetectLabelsImagePropertiesSettings) SetMaxDominantColors(v int64) *DetectLabelsImagePropertiesSettings { + s.MaxDominantColors = &v + return s +} + +// The quality of an image provided for label detection, with regard to brightness, +// sharpness, and contrast. +type DetectLabelsImageQuality struct { + _ struct{} `type:"structure"` + + // The brightness of an image provided for label detection. + Brightness *float64 `type:"float"` + + // The contrast of an image provided for label detection. + Contrast *float64 `type:"float"` + + // The sharpness of an image provided for label detection. + Sharpness *float64 `type:"float"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DetectLabelsImageQuality) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DetectLabelsImageQuality) GoString() string { + return s.String() +} + +// SetBrightness sets the Brightness field's value. +func (s *DetectLabelsImageQuality) SetBrightness(v float64) *DetectLabelsImageQuality { + s.Brightness = &v + return s +} + +// SetContrast sets the Contrast field's value. +func (s *DetectLabelsImageQuality) SetContrast(v float64) *DetectLabelsImageQuality { + s.Contrast = &v + return s +} + +// SetSharpness sets the Sharpness field's value. +func (s *DetectLabelsImageQuality) SetSharpness(v float64) *DetectLabelsImageQuality { + s.Sharpness = &v + return s +} + type DetectLabelsInput struct { _ struct{} `type:"structure"` + // A list of the types of analysis to perform. Specifying GENERAL_LABELS uses + // the label detection feature, while specifying IMAGE_PROPERTIES returns information + // regarding image color and quality. If no option is specified GENERAL_LABELS + // is used by default. + Features []*string `type:"list" enum:"DetectLabelsFeatureName"` + // The input image as base64-encoded bytes or an S3 object. If you use the AWS // CLI to call Amazon Rekognition operations, passing image bytes is not supported. // Images stored in an S3 Bucket do not need to be base64-encoded. @@ -12575,6 +12861,13 @@ type DetectLabelsInput struct { // If MinConfidence is not specified, the operation returns labels with a confidence // values greater than or equal to 55 percent. MinConfidence *float64 `type:"float"` + + // A list of the filters to be applied to returned detected labels and image + // properties. Specified filters can be inclusive, exclusive, or a combination + // of both. Filters can be used for individual labels or label categories. The + // exact label names or label categories must be supplied. For a full list of + // labels and label categories, see LINK HERE. + Settings *DetectLabelsSettings `type:"structure"` } // String returns the string representation. @@ -12613,6 +12906,12 @@ func (s *DetectLabelsInput) Validate() error { return nil } +// SetFeatures sets the Features field's value. +func (s *DetectLabelsInput) SetFeatures(v []*string) *DetectLabelsInput { + s.Features = v + return s +} + // SetImage sets the Image field's value. func (s *DetectLabelsInput) SetImage(v *Image) *DetectLabelsInput { s.Image = v @@ -12631,9 +12930,19 @@ func (s *DetectLabelsInput) SetMinConfidence(v float64) *DetectLabelsInput { return s } +// SetSettings sets the Settings field's value. +func (s *DetectLabelsInput) SetSettings(v *DetectLabelsSettings) *DetectLabelsInput { + s.Settings = v + return s +} + type DetectLabelsOutput struct { _ struct{} `type:"structure"` + // Information about the properties of the input image, such as brightness, + // sharpness, contrast, and dominant colors. + ImageProperties *DetectLabelsImageProperties `type:"structure"` + // Version number of the label detection model that was used to detect labels. LabelModelVersion *string `type:"string"` @@ -12674,6 +12983,12 @@ func (s DetectLabelsOutput) GoString() string { return s.String() } +// SetImageProperties sets the ImageProperties field's value. +func (s *DetectLabelsOutput) SetImageProperties(v *DetectLabelsImageProperties) *DetectLabelsOutput { + s.ImageProperties = v + return s +} + // SetLabelModelVersion sets the LabelModelVersion field's value. func (s *DetectLabelsOutput) SetLabelModelVersion(v string) *DetectLabelsOutput { s.LabelModelVersion = &v @@ -12692,6 +13007,50 @@ func (s *DetectLabelsOutput) SetOrientationCorrection(v string) *DetectLabelsOut return s } +// Settings for the DetectLabels request. Settings can include filters for both +// GENERAL_LABELS and IMAGE_PROPERTIES. GENERAL_LABELS filters can be inclusive +// or exclusive and applied to individual labels or label categories. IMAGE_PROPERTIES +// filters allow specification of a maximum number of dominant colors. +type DetectLabelsSettings struct { + _ struct{} `type:"structure"` + + // Contains the specified filters for GENERAL_LABELS. + GeneralLabels *GeneralLabelsSettings `type:"structure"` + + // Contains the chosen number of maximum dominant colors in an image. + ImageProperties *DetectLabelsImagePropertiesSettings `type:"structure"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DetectLabelsSettings) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DetectLabelsSettings) GoString() string { + return s.String() +} + +// SetGeneralLabels sets the GeneralLabels field's value. +func (s *DetectLabelsSettings) SetGeneralLabels(v *GeneralLabelsSettings) *DetectLabelsSettings { + s.GeneralLabels = v + return s +} + +// SetImageProperties sets the ImageProperties field's value. +func (s *DetectLabelsSettings) SetImageProperties(v *DetectLabelsImagePropertiesSettings) *DetectLabelsSettings { + s.ImageProperties = v + return s +} + type DetectModerationLabelsInput struct { _ struct{} `type:"structure"` @@ -13289,6 +13648,92 @@ func (s DistributeDatasetEntriesOutput) GoString() string { return s.String() } +// A description of the dominant colors in an image. +type DominantColor struct { + _ struct{} `type:"structure"` + + // The Blue RGB value for a dominant color. + Blue *int64 `type:"integer"` + + // The CSS color name of a dominant color. + CSSColor *string `type:"string"` + + // The Green RGB value for a dominant color. + Green *int64 `type:"integer"` + + // The Hex code equivalent of the RGB values for a dominant color. + HexCode *string `type:"string"` + + // The percentage of image pixels that have a given dominant color. + PixelPercent *float64 `type:"float"` + + // The Red RGB value for a dominant color. + Red *int64 `type:"integer"` + + // One of 12 simplified color names applied to a dominant color. + SimplifiedColor *string `type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DominantColor) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s DominantColor) GoString() string { + return s.String() +} + +// SetBlue sets the Blue field's value. +func (s *DominantColor) SetBlue(v int64) *DominantColor { + s.Blue = &v + return s +} + +// SetCSSColor sets the CSSColor field's value. +func (s *DominantColor) SetCSSColor(v string) *DominantColor { + s.CSSColor = &v + return s +} + +// SetGreen sets the Green field's value. +func (s *DominantColor) SetGreen(v int64) *DominantColor { + s.Green = &v + return s +} + +// SetHexCode sets the HexCode field's value. +func (s *DominantColor) SetHexCode(v string) *DominantColor { + s.HexCode = &v + return s +} + +// SetPixelPercent sets the PixelPercent field's value. +func (s *DominantColor) SetPixelPercent(v float64) *DominantColor { + s.PixelPercent = &v + return s +} + +// SetRed sets the Red field's value. +func (s *DominantColor) SetRed(v int64) *DominantColor { + s.Red = &v + return s +} + +// SetSimplifiedColor sets the SimplifiedColor field's value. +func (s *DominantColor) SetSimplifiedColor(v string) *DominantColor { + s.SimplifiedColor = &v + return s +} + // The emotions that appear to be expressed on the face, and the confidence // level in the determination. The API is only making a determination of the // physical appearance of a person's face. It is not a determination of the @@ -13806,6 +14251,8 @@ type FaceDetection struct { Face *FaceDetail `type:"structure"` // Time, in milliseconds from the start of the video, that the face was detected. + // Note that Timestamp is not guaranteed to be accurate to the individual frame + // where the face first appears. Timestamp *int64 `type:"long"` } @@ -14041,6 +14488,67 @@ func (s *Gender) SetValue(v string) *Gender { return s } +// Contains filters for the object labels returned by DetectLabels. Filters +// can be inclusive, exclusive, or a combination of both and can be applied +// to individual l abels or entire label categories. +type GeneralLabelsSettings struct { + _ struct{} `type:"structure"` + + // The label categories that should be excluded from the return from DetectLabels. + LabelCategoryExclusionFilters []*string `type:"list"` + + // The label categories that should be included in the return from DetectLabels. + LabelCategoryInclusionFilters []*string `type:"list"` + + // The labels that should be excluded from the return from DetectLabels. + LabelExclusionFilters []*string `type:"list"` + + // The labels that should be included in the return from DetectLabels. + LabelInclusionFilters []*string `type:"list"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s GeneralLabelsSettings) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s GeneralLabelsSettings) GoString() string { + return s.String() +} + +// SetLabelCategoryExclusionFilters sets the LabelCategoryExclusionFilters field's value. +func (s *GeneralLabelsSettings) SetLabelCategoryExclusionFilters(v []*string) *GeneralLabelsSettings { + s.LabelCategoryExclusionFilters = v + return s +} + +// SetLabelCategoryInclusionFilters sets the LabelCategoryInclusionFilters field's value. +func (s *GeneralLabelsSettings) SetLabelCategoryInclusionFilters(v []*string) *GeneralLabelsSettings { + s.LabelCategoryInclusionFilters = v + return s +} + +// SetLabelExclusionFilters sets the LabelExclusionFilters field's value. +func (s *GeneralLabelsSettings) SetLabelExclusionFilters(v []*string) *GeneralLabelsSettings { + s.LabelExclusionFilters = v + return s +} + +// SetLabelInclusionFilters sets the LabelInclusionFilters field's value. +func (s *GeneralLabelsSettings) SetLabelInclusionFilters(v []*string) *GeneralLabelsSettings { + s.LabelInclusionFilters = v + return s +} + // Information about where an object (DetectCustomLabels) or text (DetectText) // is located on an image. type Geometry struct { @@ -16265,6 +16773,9 @@ type Instance struct { // The confidence that Amazon Rekognition has in the accuracy of the bounding // box. Confidence *float64 `type:"float"` + + // The dominant colors found in an individual instance of a label. + DominantColors []*DominantColor `type:"list"` } // String returns the string representation. @@ -16297,6 +16808,12 @@ func (s *Instance) SetConfidence(v float64) *Instance { return s } +// SetDominantColors sets the DominantColors field's value. +func (s *Instance) SetDominantColors(v []*DominantColor) *Instance { + s.DominantColors = v + return s +} + // Amazon Rekognition experienced a service issue. Try your call again. type InternalServerError struct { _ struct{} `type:"structure"` @@ -16751,8 +17268,10 @@ func (s *KinesisVideoStream) SetArn(v string) *KinesisVideoStream { } // Specifies the starting point in a Kinesis stream to start processing. You -// can use the producer timestamp or the fragment number. For more information, -// see Fragment (https://docs.aws.amazon.com/kinesisvideostreams/latest/dg/API_reader_Fragment.html). +// can use the producer timestamp or the fragment number. One of either producer +// timestamp or fragment number is required. If you use the producer timestamp, +// you must put the time in milliseconds. For more information about fragment +// numbers, see Fragment (https://docs.aws.amazon.com/kinesisvideostreams/latest/dg/API_reader_Fragment.html). type KinesisVideoStreamStartSelector struct { _ struct{} `type:"structure"` @@ -16760,7 +17279,8 @@ type KinesisVideoStreamStartSelector struct { // based on the ingestion order. FragmentNumber *string `min:"1" type:"string"` - // The timestamp from the producer corresponding to the fragment. + // The timestamp from the producer corresponding to the fragment, in milliseconds, + // expressed in unix time format. ProducerTimestamp *int64 `type:"long"` } @@ -16845,6 +17365,12 @@ func (s *KnownGender) SetType(v string) *KnownGender { type Label struct { _ struct{} `type:"structure"` + // A list of potential aliases for a given label. + Aliases []*LabelAlias `type:"list"` + + // A list of the categories associated with a given label. + Categories []*LabelCategory `type:"list"` + // Level of confidence. Confidence *float64 `type:"float"` @@ -16878,6 +17404,18 @@ func (s Label) GoString() string { return s.String() } +// SetAliases sets the Aliases field's value. +func (s *Label) SetAliases(v []*LabelAlias) *Label { + s.Aliases = v + return s +} + +// SetCategories sets the Categories field's value. +func (s *Label) SetCategories(v []*LabelCategory) *Label { + s.Categories = v + return s +} + // SetConfidence sets the Confidence field's value. func (s *Label) SetConfidence(v float64) *Label { s.Confidence = &v @@ -16902,6 +17440,70 @@ func (s *Label) SetParents(v []*Parent) *Label { return s } +// A potential alias of for a given label. +type LabelAlias struct { + _ struct{} `type:"structure"` + + // The name of an alias for a given label. + Name *string `type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s LabelAlias) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s LabelAlias) GoString() string { + return s.String() +} + +// SetName sets the Name field's value. +func (s *LabelAlias) SetName(v string) *LabelAlias { + s.Name = &v + return s +} + +// The category that applies to a given label. +type LabelCategory struct { + _ struct{} `type:"structure"` + + // The name of a category that applies to a given label. + Name *string `type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s LabelCategory) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s LabelCategory) GoString() string { + return s.String() +} + +// SetName sets the Name field's value. +func (s *LabelCategory) SetName(v string) *LabelCategory { + s.Name = &v + return s +} + // Information about a label detected in a video analysis request and the time // the label was detected in the video. type LabelDetection struct { @@ -16911,6 +17513,8 @@ type LabelDetection struct { Label *Label `type:"structure"` // Time, in milliseconds from the start of the video, that the label was detected. + // Note that Timestamp is not guaranteed to be accurate to the individual frame + // where the label first appears. Timestamp *int64 `type:"long"` } @@ -18293,7 +18897,8 @@ type PersonDetection struct { Person *PersonDetail `type:"structure"` // The time, in milliseconds from the start of the video, that the person's - // path was tracked. + // path was tracked. Note that Timestamp is not guaranteed to be accurate to + // the individual frame where the person's path first appears. Timestamp *int64 `type:"long"` } @@ -21728,8 +22333,9 @@ type StartStreamProcessorInput struct { Name *string `min:"1" type:"string" required:"true"` // Specifies the starting point in the Kinesis stream to start processing. You - // can use the producer timestamp or the fragment number. For more information, - // see Fragment (https://docs.aws.amazon.com/kinesisvideostreams/latest/dg/API_reader_Fragment.html). + // can use the producer timestamp or the fragment number. If you use the producer + // timestamp, you must put the time in milliseconds. For more information about + // fragment numbers, see Fragment (https://docs.aws.amazon.com/kinesisvideostreams/latest/dg/API_reader_Fragment.html). // // This is a required parameter for label detection stream processors and should // not be used to start a face search stream processor. @@ -22244,11 +22850,13 @@ func (s StopStreamProcessorOutput) GoString() string { return s.String() } +// This is a required parameter for label detection stream processors and should +// not be used to start a face search stream processor. type StreamProcessingStartSelector struct { _ struct{} `type:"structure"` // Specifies the starting point in the stream to start processing. This can - // be done with a timestamp or a fragment number in a Kinesis stream. + // be done with a producer timestamp or a fragment number in a Kinesis stream. KVSStreamStartSelector *KinesisVideoStreamStartSelector `type:"structure"` } @@ -23141,7 +23749,8 @@ type TextDetectionResult struct { TextDetection *TextDetection `type:"structure"` // The time, in milliseconds from the start of the video, that the text was - // detected. + // detected. Note that Timestamp is not guaranteed to be accurate to the individual + // frame where the text first appears. Timestamp *int64 `type:"long"` } @@ -24107,6 +24716,22 @@ func DatasetType_Values() []string { } } +const ( + // DetectLabelsFeatureNameGeneralLabels is a DetectLabelsFeatureName enum value + DetectLabelsFeatureNameGeneralLabels = "GENERAL_LABELS" + + // DetectLabelsFeatureNameImageProperties is a DetectLabelsFeatureName enum value + DetectLabelsFeatureNameImageProperties = "IMAGE_PROPERTIES" +) + +// DetectLabelsFeatureName_Values returns all elements of the DetectLabelsFeatureName enum +func DetectLabelsFeatureName_Values() []string { + return []string{ + DetectLabelsFeatureNameGeneralLabels, + DetectLabelsFeatureNameImageProperties, + } +} + const ( // EmotionNameHappy is a EmotionName enum value EmotionNameHappy = "HAPPY" diff --git a/service/securityhub/api.go b/service/securityhub/api.go index 27ea2ff8c07..c25fe2eb06c 100644 --- a/service/securityhub/api.go +++ b/service/securityhub/api.go @@ -9311,7 +9311,8 @@ func (s *AwsBackupBackupPlanLifecycleDetails) SetMoveToColdStorageAfterDays(v in return s } -// An array of CopyAction objects, which contains the details of the copy operation. +// An array of CopyAction objects, each of which contains details of the copy +// operation. type AwsBackupBackupPlanRuleCopyActionsDetails struct { _ struct{} `type:"structure"` @@ -9368,7 +9369,8 @@ type AwsBackupBackupPlanRuleDetails struct { // be completed, or it is canceled by Backup. CompletionWindowMinutes *int64 `type:"long"` - // An array of CopyAction objects, which contains the details of the copy operation. + // An array of CopyAction objects, each of which contains details of the copy + // operation. CopyActions []*AwsBackupBackupPlanRuleCopyActionsDetails `type:"list"` // Specifies whether Backup creates continuous backups capable of point-in-time @@ -36315,10 +36317,10 @@ type CreateFindingAggregatorInput struct { // RegionLinkingMode is a required field RegionLinkingMode *string `type:"string" required:"true"` - // If RegionLinkingMode is ALL_REGIONS_EXCEPT_SPECIFIED, then this is a comma-separated + // If RegionLinkingMode is ALL_REGIONS_EXCEPT_SPECIFIED, then this is a space-separated // list of Regions that do not aggregate findings to the aggregation Region. // - // If RegionLinkingMode is SPECIFIED_REGIONS, then this is a comma-separated + // If RegionLinkingMode is SPECIFIED_REGIONS, then this is a space-separated // list of Regions that do aggregate findings to the aggregation Region. Regions []*string `type:"list"` } @@ -46532,10 +46534,10 @@ type UpdateFindingAggregatorInput struct { // RegionLinkingMode is a required field RegionLinkingMode *string `type:"string" required:"true"` - // If RegionLinkingMode is ALL_REGIONS_EXCEPT_SPECIFIED, then this is a comma-separated + // If RegionLinkingMode is ALL_REGIONS_EXCEPT_SPECIFIED, then this is a space-separated // list of Regions that do not aggregate findings to the aggregation Region. // - // If RegionLinkingMode is SPECIFIED_REGIONS, then this is a comma-separated + // If RegionLinkingMode is SPECIFIED_REGIONS, then this is a space-separated // list of Regions that do aggregate findings to the aggregation Region. Regions []*string `type:"list"` } diff --git a/service/ssmincidents/api.go b/service/ssmincidents/api.go index 356631b9f6d..5bb8a0a5f19 100644 --- a/service/ssmincidents/api.go +++ b/service/ssmincidents/api.go @@ -3812,6 +3812,15 @@ type CreateTimelineEventInput struct { // EventData is a required field EventData *string `locationName:"eventData" type:"string" required:"true"` + // Adds one or more references to the TimelineEvent. A reference can be an Amazon + // Web Services resource involved in the incident or in some way associated + // with it. When you specify a reference, you enter the Amazon Resource Name + // (ARN) of the resource. You can also specify a related item. As an example, + // you could specify the ARN of an Amazon DynamoDB (DynamoDB) table. The table + // for this example is the resource. You could also specify a Amazon CloudWatch + // metric for that table. The metric is the related item. + EventReferences []*EventReference `locationName:"eventReferences" type:"list"` + // The time that the event occurred. // // EventTime is a required field @@ -3881,6 +3890,12 @@ func (s *CreateTimelineEventInput) SetEventData(v string) *CreateTimelineEventIn return s } +// SetEventReferences sets the EventReferences field's value. +func (s *CreateTimelineEventInput) SetEventReferences(v []*EventReference) *CreateTimelineEventInput { + s.EventReferences = v + return s +} + // SetEventTime sets the EventTime field's value. func (s *CreateTimelineEventInput) SetEventTime(v time.Time) *CreateTimelineEventInput { s.EventTime = &v @@ -4418,6 +4433,50 @@ func (s EmptyChatChannel) GoString() string { return s.String() } +// An item referenced in a TimelineEvent that is involved in or somehow associated +// with an incident. You can specify an Amazon Resource Name (ARN) for an Amazon +// Web Services resource or a RelatedItem ID. +type EventReference struct { + _ struct{} `type:"structure"` + + // The ID of a RelatedItem referenced in a TimelineEvent. + RelatedItemId *string `locationName:"relatedItemId" type:"string"` + + // The Amazon Resource Name (ARN) of an Amazon Web Services resource referenced + // in a TimelineEvent. + Resource *string `locationName:"resource" type:"string"` +} + +// String returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s EventReference) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation. +// +// API parameter values that are decorated as "sensitive" in the API will not +// be included in the string output. The member name will be present, but the +// value will be replaced with "sensitive". +func (s EventReference) GoString() string { + return s.String() +} + +// SetRelatedItemId sets the RelatedItemId field's value. +func (s *EventReference) SetRelatedItemId(v string) *EventReference { + s.RelatedItemId = &v + return s +} + +// SetResource sets the Resource field's value. +func (s *EventReference) SetResource(v string) *EventReference { + s.Resource = &v + return s +} + // Details about a timeline event during an incident. type EventSummary struct { _ struct{} `type:"structure"` @@ -4427,6 +4486,9 @@ type EventSummary struct { // EventId is a required field EventId *string `locationName:"eventId" type:"string" required:"true"` + // A list of references in a TimelineEvent. + EventReferences []*EventReference `locationName:"eventReferences" type:"list"` + // The time that the event occurred. // // EventTime is a required field @@ -4472,6 +4534,12 @@ func (s *EventSummary) SetEventId(v string) *EventSummary { return s } +// SetEventReferences sets the EventReferences field's value. +func (s *EventSummary) SetEventReferences(v []*EventReference) *EventSummary { + s.EventReferences = v + return s +} + // SetEventTime sets the EventTime field's value. func (s *EventSummary) SetEventTime(v time.Time) *EventSummary { s.EventTime = &v @@ -6582,6 +6650,12 @@ func (s *RegionMapInputValue) SetSseKmsKeyId(v string) *RegionMapInputValue { type RelatedItem struct { _ struct{} `type:"structure"` + // A unique ID for a RelatedItem. + // + // Don't specify this parameter when you add a RelatedItem by using the UpdateRelatedItems + // API action. + GeneratedId *string `locationName:"generatedId" type:"string"` + // Details about the related item. // // Identifier is a required field @@ -6627,6 +6701,12 @@ func (s *RelatedItem) Validate() error { return nil } +// SetGeneratedId sets the GeneratedId field's value. +func (s *RelatedItem) SetGeneratedId(v string) *RelatedItem { + s.GeneratedId = &v + return s +} + // SetIdentifier sets the Identifier field's value. func (s *RelatedItem) SetIdentifier(v *ItemIdentifier) *RelatedItem { s.Identifier = v @@ -7520,6 +7600,9 @@ type TimelineEvent struct { // EventId is a required field EventId *string `locationName:"eventId" type:"string" required:"true"` + // A list of references in a TimelineEvent. + EventReferences []*EventReference `locationName:"eventReferences" type:"list"` + // The time that the event occurred. // // EventTime is a required field @@ -7572,6 +7655,12 @@ func (s *TimelineEvent) SetEventId(v string) *TimelineEvent { return s } +// SetEventReferences sets the EventReferences field's value. +func (s *TimelineEvent) SetEventReferences(v []*EventReference) *TimelineEvent { + s.EventReferences = v + return s +} + // SetEventTime sets the EventTime field's value. func (s *TimelineEvent) SetEventTime(v time.Time) *TimelineEvent { s.EventTime = &v @@ -8507,6 +8596,19 @@ type UpdateTimelineEventInput struct { // EventId is a required field EventId *string `locationName:"eventId" type:"string" required:"true"` + // Updates all existing references in a TimelineEvent. A reference can be an + // Amazon Web Services resource involved in the incident or in some way associated + // with it. When you specify a reference, you enter the Amazon Resource Name + // (ARN) of the resource. You can also specify a related item. As an example, + // you could specify the ARN of an Amazon DynamoDB (DynamoDB) table. The table + // for this example is the resource. You could also specify a Amazon CloudWatch + // metric for that table. The metric is the related item. + // + // This update action overrides all existing references. If you want to keep + // existing references, you must specify them in the call. If you don't, this + // action removes them and enters only new references. + EventReferences []*EventReference `locationName:"eventReferences" type:"list"` + // The time that the event occurred. EventTime *time.Time `locationName:"eventTime" type:"timestamp"` @@ -8572,6 +8674,12 @@ func (s *UpdateTimelineEventInput) SetEventId(v string) *UpdateTimelineEventInpu return s } +// SetEventReferences sets the EventReferences field's value. +func (s *UpdateTimelineEventInput) SetEventReferences(v []*EventReference) *UpdateTimelineEventInput { + s.EventReferences = v + return s +} + // SetEventTime sets the EventTime field's value. func (s *UpdateTimelineEventInput) SetEventTime(v time.Time) *UpdateTimelineEventInput { s.EventTime = &v