From 5dffee82f61884e6f39fcea164ab56042c9891cd Mon Sep 17 00:00:00 2001 From: awssdkgo Date: Mon, 8 Feb 2021 19:09:35 +0000 Subject: [PATCH] Release v1.37.7 (2021-02-08) === ### Service Client Updates * `service/cloudtrail`: Updates service API and documentation * ConflictException is now thrown when certain operations are called on resources before CloudTrail has time to load the resources. Two new exceptions have been added to the PutInsightSelectors API. * `service/dataexchange`: Updates service API and documentation * `service/elasticache`: Updates service documentation * Documentation updates for elasticache * `service/elasticloadbalancingv2`: Updates service documentation * `service/globalaccelerator`: Updates service API and documentation * `service/iotsitewise`: Updates service API and documentation * `service/ivs`: Updates service API * `service/macie2`: Updates service API and documentation --- CHANGELOG.md | 15 ++ aws/endpoints/defaults.go | 10 + aws/version.go | 2 +- models/apis/cloudtrail/2013-11-01/api-2.json | 11 +- models/apis/cloudtrail/2013-11-01/docs-2.json | 9 +- .../apis/dataexchange/2017-07-25/api-2.json | 71 +++++- .../apis/dataexchange/2017-07-25/docs-2.json | 38 ++- .../apis/elasticache/2015-02-02/docs-2.json | 8 +- .../2015-12-01/docs-2.json | 2 +- .../globalaccelerator/2018-08-08/api-2.json | 1 + .../globalaccelerator/2018-08-08/docs-2.json | 5 +- models/apis/iotsitewise/2019-12-02/api-2.json | 47 ---- .../apis/iotsitewise/2019-12-02/docs-2.json | 25 -- models/apis/ivs/2020-07-14/api-2.json | 14 +- models/apis/macie2/2020-01-01/api-2.json | 52 ++++- models/apis/macie2/2020-01-01/docs-2.json | 77 ++++--- models/endpoints/endpoints.json | 10 + service/cloudtrail/api.go | 85 ++++++- service/cloudtrail/errors.go | 10 + service/dataexchange/api.go | 218 +++++++++++++++++- service/elasticache/api.go | 29 +-- service/elbv2/api.go | 10 +- service/globalaccelerator/api.go | 29 ++- service/iotsitewise/api.go | 172 -------------- .../iotsitewise/iotsitewiseiface/interface.go | 4 - service/ivs/api.go | 6 +- service/macie2/api.go | 205 ++++++++++++---- 27 files changed, 793 insertions(+), 372 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c45ba07d4f8..64c76187e3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +Release v1.37.7 (2021-02-08) +=== + +### Service Client Updates +* `service/cloudtrail`: Updates service API and documentation + * ConflictException is now thrown when certain operations are called on resources before CloudTrail has time to load the resources. Two new exceptions have been added to the PutInsightSelectors API. +* `service/dataexchange`: Updates service API and documentation +* `service/elasticache`: Updates service documentation + * Documentation updates for elasticache +* `service/elasticloadbalancingv2`: Updates service documentation +* `service/globalaccelerator`: Updates service API and documentation +* `service/iotsitewise`: Updates service API and documentation +* `service/ivs`: Updates service API +* `service/macie2`: Updates service API and documentation + Release v1.37.6 (2021-02-05) === diff --git a/aws/endpoints/defaults.go b/aws/endpoints/defaults.go index 181df7f6b75..057786d1b73 100644 --- a/aws/endpoints/defaults.go +++ b/aws/endpoints/defaults.go @@ -7455,6 +7455,16 @@ var awscnPartition = partition{ "cn-north-1": endpoint{}, }, }, + "guardduty": service{ + IsRegionalized: boxedTrue, + Defaults: endpoint{ + Protocols: []string{"https"}, + }, + Endpoints: endpoints{ + "cn-north-1": endpoint{}, + "cn-northwest-1": endpoint{}, + }, + }, "health": service{ Endpoints: endpoints{ diff --git a/aws/version.go b/aws/version.go index 551236faa5e..04d78bf6a02 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.37.6" +const SDKVersion = "1.37.7" diff --git a/models/apis/cloudtrail/2013-11-01/api-2.json b/models/apis/cloudtrail/2013-11-01/api-2.json index adb4af51c70..91c33c42c65 100644 --- a/models/apis/cloudtrail/2013-11-01/api-2.json +++ b/models/apis/cloudtrail/2013-11-01/api-2.json @@ -89,7 +89,8 @@ {"shape":"UnsupportedOperationException"}, {"shape":"OperationNotPermittedException"}, {"shape":"NotOrganizationMasterAccountException"}, - {"shape":"InsufficientDependencyServiceAccessPermissionException"} + {"shape":"InsufficientDependencyServiceAccessPermissionException"}, + {"shape":"ConflictException"} ], "idempotent":true }, @@ -276,6 +277,8 @@ {"shape":"InvalidInsightSelectorsException"}, {"shape":"InsufficientS3BucketPolicyException"}, {"shape":"InsufficientEncryptionPolicyException"}, + {"shape":"S3BucketDoesNotExistException"}, + {"shape":"KmsException"}, {"shape":"UnsupportedOperationException"}, {"shape":"OperationNotPermittedException"}, {"shape":"NotOrganizationMasterAccountException"} @@ -451,6 +454,12 @@ }, "exception":true }, + "ConflictException":{ + "type":"structure", + "members":{ + }, + "exception":true + }, "CreateTrailRequest":{ "type":"structure", "required":[ diff --git a/models/apis/cloudtrail/2013-11-01/docs-2.json b/models/apis/cloudtrail/2013-11-01/docs-2.json index bdcccb8bf23..04057b71e6f 100644 --- a/models/apis/cloudtrail/2013-11-01/docs-2.json +++ b/models/apis/cloudtrail/2013-11-01/docs-2.json @@ -114,6 +114,11 @@ "refs": { } }, + "ConflictException": { + "base": "

This exception is thrown when the specified resource is not ready for an operation. This can occur when you try to run an operation on a trail before CloudTrail has time to fully load the trail. If this exception occurs, wait a few minutes, and then try the operation again.

", + "refs": { + } + }, "CreateTrailRequest": { "base": "

Specifies the settings for each trail.

", "refs": { @@ -617,7 +622,7 @@ "SelectorField": { "base": null, "refs": { - "AdvancedFieldSelector$Field": "

A field in an event record on which to filter events to be logged. Supported fields include readOnly, eventCategory, eventSource (for management events), eventName, resources.type, and resources.ARN.

" + "AdvancedFieldSelector$Field": "

A field in an event record on which to filter events to be logged. Supported fields include readOnly, eventCategory, eventSource (for management events), eventName, resources.type, and resources.ARN.

" } }, "SelectorName": { @@ -666,7 +671,7 @@ "CreateTrailResponse$CloudWatchLogsLogGroupArn": "

Specifies the Amazon Resource Name (ARN) of the log group to which CloudTrail logs will be delivered.

", "CreateTrailResponse$CloudWatchLogsRoleArn": "

Specifies the role for the CloudWatch Logs endpoint to assume to write to a user's log group.

", "CreateTrailResponse$KmsKeyId": "

Specifies the KMS key ID that encrypts the logs delivered by CloudTrail. The value is a fully specified ARN to a KMS key in the format:

arn:aws:kms:us-east-2:123456789012:key/12345678-1234-1234-1234-123456789012

", - "DataResource$Type": "

The resource type in which you want to log data events. You can specify AWS::S3::Object or AWS::Lambda::Function resources.

", + "DataResource$Type": "

The resource type in which you want to log data events. You can specify AWS::S3::Object or AWS::Lambda::Function resources.

The AWS::S3Outposts::Object resource type is not valid in basic event selectors. To log data events on this resource type, use advanced event selectors.

", "DataResourceValues$member": null, "DeleteTrailRequest$Name": "

Specifies the name or the CloudTrail ARN of the trail to be deleted. The format of a trail ARN is: arn:aws:cloudtrail:us-east-2:123456789012:trail/MyTrail

", "Event$EventId": "

The CloudTrail ID of the event returned.

", diff --git a/models/apis/dataexchange/2017-07-25/api-2.json b/models/apis/dataexchange/2017-07-25/api-2.json index 481ffe347d7..54c9cad672b 100644 --- a/models/apis/dataexchange/2017-07-25/api-2.json +++ b/models/apis/dataexchange/2017-07-25/api-2.json @@ -1142,6 +1142,42 @@ "RevisionId" ] }, + "ExportRevisionsToS3RequestDetails": { + "type": "structure", + "members": { + "DataSetId": { + "shape": "Id" + }, + "Encryption": { + "shape": "ExportServerSideEncryption" + }, + "RevisionDestinations": { + "shape": "ListOfRevisionDestinationEntry" + } + }, + "required": [ + "RevisionDestinations", + "DataSetId" + ] + }, + "ExportRevisionsToS3ResponseDetails": { + "type": "structure", + "members": { + "DataSetId": { + "shape": "Id" + }, + "Encryption": { + "shape": "ExportServerSideEncryption" + }, + "RevisionDestinations": { + "shape": "ListOfRevisionDestinationEntry" + } + }, + "required": [ + "RevisionDestinations", + "DataSetId" + ] + }, "ExportServerSideEncryption": { "type": "structure", "members": { @@ -1690,6 +1726,12 @@ "shape": "AssetSourceEntry" } }, + "ListOfRevisionDestinationEntry": { + "type": "list", + "member": { + "shape": "RevisionDestinationEntry" + } + }, "ListRevisionAssetsRequest": { "type": "structure", "members": { @@ -1790,6 +1832,9 @@ "ExportAssetsToS3": { "shape": "ExportAssetsToS3RequestDetails" }, + "ExportRevisionsToS3": { + "shape": "ExportRevisionsToS3RequestDetails" + }, "ImportAssetFromSignedUrl": { "shape": "ImportAssetFromSignedUrlRequestDetails" }, @@ -1837,6 +1882,9 @@ "ExportAssetsToS3": { "shape": "ExportAssetsToS3ResponseDetails" }, + "ExportRevisionsToS3": { + "shape": "ExportRevisionsToS3ResponseDetails" + }, "ImportAssetFromSignedUrl": { "shape": "ImportAssetFromSignedUrlResponseDetails" }, @@ -1845,6 +1893,24 @@ } } }, + "RevisionDestinationEntry": { + "type": "structure", + "members": { + "Bucket": { + "shape": "__string" + }, + "KeyPattern": { + "shape": "__string" + }, + "RevisionId": { + "shape": "Id" + } + }, + "required": [ + "Bucket", + "RevisionId" + ] + }, "RevisionEntry": { "type": "structure", "members": { @@ -1991,7 +2057,8 @@ "IMPORT_ASSETS_FROM_S3", "IMPORT_ASSET_FROM_SIGNED_URL", "EXPORT_ASSETS_TO_S3", - "EXPORT_ASSET_TO_SIGNED_URL" + "EXPORT_ASSET_TO_SIGNED_URL", + "EXPORT_REVISIONS_TO_S3" ] }, "UntagResourceRequest": { @@ -2266,7 +2333,7 @@ "type": "string", "min": 24, "max": 24, - "pattern": "/^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/" + "pattern": "^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$" } } } \ No newline at end of file diff --git a/models/apis/dataexchange/2017-07-25/docs-2.json b/models/apis/dataexchange/2017-07-25/docs-2.json index 056aaac5f22..0fc3738cb56 100644 --- a/models/apis/dataexchange/2017-07-25/docs-2.json +++ b/models/apis/dataexchange/2017-07-25/docs-2.json @@ -111,7 +111,7 @@ "refs" : { } }, "CreateJobRequest" : { - "base" : "

The CreateJob request. AWS Data Exchange Jobs are asynchronous import or export operations used to create or copy assets. A data set owner can both import and export as they see fit. Someone with an entitlement to a data set can only export. Jobs are deleted 90 days after they are created. Created jobs must be started with the StartJob operation.

", + "base" : "

The CreateJob request. AWS Data Exchange Jobs are asynchronous import or export operations used to create or copy assets. A data set owner can both import and export assets. A subscriber with an entitlement to a data set can only export. Jobs are deleted 90 days after they are created. Created jobs must be started with the StartJob operation.

", "refs" : { } }, "CreateRevisionRequest" : { @@ -168,11 +168,25 @@ "ResponseDetails$ExportAssetsToS3" : "

Details for the export to Amazon S3 response.

" } }, + "ExportRevisionsToS3RequestDetails" : { + "base" : "

Details of the operation to be performed by the job.

", + "refs" : { + "RequestDetails$ExportRevisionsToS3" : "

Details about the export to Amazon S3 request.

" + } + }, + "ExportRevisionsToS3ResponseDetails" : { + "base" : "

Details about the export revisions to Amazon S3 response.

", + "refs" : { + "ResponseDetails$ExportRevisionsToS3" : "

Details for the export revisions to Amazon S3 response.

" + } + }, "ExportServerSideEncryption" : { "base" : "

Encryption configuration of the export job. Includes the encryption type as well as the AWS KMS key. The KMS key is only necessary if you chose the KMS encryption type.

", "refs" : { "ExportAssetsToS3RequestDetails$Encryption" : "

Encryption configuration for the export job.

", - "ExportAssetsToS3ResponseDetails$Encryption" : "

Encryption configuration of the export job.

" + "ExportAssetsToS3ResponseDetails$Encryption" : "

Encryption configuration of the export job.

", + "ExportRevisionsToS3RequestDetails$Encryption" : "

Encryption configuration for the export job.

", + "ExportRevisionsToS3ResponseDetails$Encryption" : "

Encryption configuration of the export job.

" } }, "Id" : { @@ -201,6 +215,8 @@ "ExportAssetsToS3RequestDetails$RevisionId" : "

The unique identifier for the revision associated with this export request.

", "ExportAssetsToS3ResponseDetails$DataSetId" : "

The unique identifier for the data set associated with this export job.

", "ExportAssetsToS3ResponseDetails$RevisionId" : "

The unique identifier for the revision associated with this export response.

", + "ExportRevisionsToS3RequestDetails$DataSetId" : "

The unique identifier for the data set associated with this export job.

", + "ExportRevisionsToS3ResponseDetails$DataSetId" : "

The unique identifier for the data set associated with this export job.

", "ImportAssetFromSignedUrlRequestDetails$DataSetId" : "

The unique identifier for the data set associated with this import job.

", "ImportAssetFromSignedUrlRequestDetails$RevisionId" : "

The unique identifier for the revision associated with this import request.

", "ImportAssetFromSignedUrlResponseDetails$DataSetId" : "

The unique identifier for the data set associated with this import job.

", @@ -214,6 +230,7 @@ "Revision$DataSetId" : "

The unique identifier for the data set associated with this revision.

", "Revision$Id" : "

The unique identifier for the revision.

", "Revision$SourceId" : "

The revision ID of the owned revision corresponding to the entitled revision being viewed. This parameter is returned when a revision owner is viewing the entitled copy of its owned revision.

", + "RevisionDestinationEntry$RevisionId" : "

The unique identifier for the revision.

", "RevisionEntry$DataSetId" : "

The unique identifier for the data set associated with this revision.

", "RevisionEntry$Id" : "

The unique identifier for the revision.

", "RevisionEntry$SourceId" : "

The revision ID of the owned revision corresponding to the entitled revision being viewed. This parameter is returned when a revision owner is viewing the entitled copy of its owned revision.

", @@ -319,6 +336,13 @@ "base" : "

The token value retrieved from a previous call to access the next page of results.

", "refs" : { } }, + "ListOfRevisionDestinationEntry" : { + "base" : "

The destination where the assets in the revision will be exported.

", + "refs" : { + "ExportRevisionsToS3RequestDetails$RevisionDestinations" : "

The destination for the revision.

", + "ExportRevisionsToS3ResponseDetails$RevisionDestinations" : "

The destination in Amazon S3 where the revision is exported.

" + } + }, "ListOfRevisions" : { "base" : "

The revision objects listed by the request.

", "refs" : { } @@ -386,6 +410,12 @@ "base" : "

A revision is a container for one or more assets.

", "refs" : { } }, + "RevisionDestinationEntry" : { + "base" : "

The destination where the assets in the revision will be exported.

", + "refs" : { + "ListOfRevisionDestinationEntry$member" : null + } + }, "RevisionEntry" : { "base" : "

A revision is a container for one or more assets.

", "refs" : { @@ -568,6 +598,8 @@ "OriginDetails$ProductId" : null, "ResourceNotFoundException$Message" : "

The resource couldn't be found.

", "ResourceNotFoundException$ResourceId" : "

The unique identifier for the resource that couldn't be found.

", + "RevisionDestinationEntry$Bucket" : "

The S3 bucket that is the destination for the assets in the revision.

", + "RevisionDestinationEntry$KeyPattern" : "

A string representing the pattern for generated names of the individual assets in the revision. For more information about key patterns, see Key patterns when exporting revisions.

", "ServiceQuotaExceededException$Message" : "

The request has exceeded the quotas imposed by the service.

", "ThrottlingException$Message" : "

The limit on the number of requests per second was exceeded.

", "ValidationException$Message" : "

The message that informs you about what was invalid about the request.

", @@ -592,4 +624,4 @@ } } } -} +} \ No newline at end of file diff --git a/models/apis/elasticache/2015-02-02/docs-2.json b/models/apis/elasticache/2015-02-02/docs-2.json index 89b8c5834dc..a4f60a783b5 100644 --- a/models/apis/elasticache/2015-02-02/docs-2.json +++ b/models/apis/elasticache/2015-02-02/docs-2.json @@ -22,7 +22,7 @@ "DeleteCacheCluster": "

Deletes a previously provisioned cluster. DeleteCacheCluster deletes all associated cache nodes, node endpoints and the cluster itself. When you receive a successful response from this operation, Amazon ElastiCache immediately begins deleting the cluster; you cannot cancel or revert this operation.

This operation is not valid for:

", "DeleteCacheParameterGroup": "

Deletes the specified cache parameter group. You cannot delete a cache parameter group if it is associated with any cache clusters. You cannot delete the default cache parameter groups in your account.

", "DeleteCacheSecurityGroup": "

Deletes a cache security group.

You cannot delete a cache security group if it is associated with any clusters.

", - "DeleteCacheSubnetGroup": "

Deletes a cache subnet group.

You cannot delete a cache subnet group if it is associated with any clusters.

", + "DeleteCacheSubnetGroup": "

Deletes a cache subnet group.

You cannot delete a default cache subnet group or one that is associated with any clusters.

", "DeleteGlobalReplicationGroup": "

Deleting a Global Datastore is a two-step process:

Since the Global Datastore has only a primary cluster, you can delete the Global Datastore while retaining the primary by setting RetainPrimaryCluster=true.

When you receive a successful response from this operation, Amazon ElastiCache immediately begins deleting the selected resources; you cannot cancel or revert this operation.

", "DeleteReplicationGroup": "

Deletes an existing replication group. By default, this operation deletes the entire replication group, including the primary/primaries and all of the read replicas. If the replication group has only one primary, you can optionally delete only the read replicas, while retaining the primary by setting RetainPrimaryCluster=true.

When you receive a successful response from this operation, Amazon ElastiCache immediately begins deleting the selected resources; you cannot cancel or revert this operation.

This operation is valid for Redis only.

", "DeleteSnapshot": "

Deletes an existing snapshot. When you receive a successful response from this operation, ElastiCache immediately begins deleting the snapshot; you cannot cancel or revert this operation.

This operation is valid for Redis only.

", @@ -56,7 +56,7 @@ "ModifyCacheSubnetGroup": "

Modifies an existing cache subnet group.

", "ModifyGlobalReplicationGroup": "

Modifies the settings for a Global Datastore.

", "ModifyReplicationGroup": "

Modifies the settings for a replication group.

This operation is valid for Redis only.

", - "ModifyReplicationGroupShardConfiguration": "

Modifies a replication group's shards (node groups) by allowing you to add shards, remove shards, or rebalance the keyspaces among exisiting shards.

", + "ModifyReplicationGroupShardConfiguration": "

Modifies a replication group's shards (node groups) by allowing you to add shards, remove shards, or rebalance the keyspaces among existing shards.

", "ModifyUser": "

Changes user password(s) and/or access string.

", "ModifyUserGroup": "

Changes the list of users that belong to the user group.

", "PurchaseReservedCacheNodesOffering": "

Allows you to purchase a reserved cache node offering. Reserved nodes are not eligible for cancellation and are non-refundable. For more information, see Managing Costs with Reserved Nodes for Redis or Managing Costs with Reserved Nodes for Memcached.

", @@ -1973,7 +1973,7 @@ "CreateCacheClusterMessage$CacheParameterGroupName": "

The name of the parameter group to associate with this cluster. If this argument is omitted, the default parameter group for the specified engine is used. You cannot use any parameter group which has cluster-enabled='yes' when creating a cluster.

", "CreateCacheClusterMessage$CacheSubnetGroupName": "

The name of the subnet group to be used for the cluster.

Use this parameter only when you are creating a cluster in an Amazon Virtual Private Cloud (Amazon VPC).

If you're going to launch your cluster in an Amazon VPC, you need to create a subnet group before you start creating a cluster. For more information, see Subnets and Subnet Groups.

", "CreateCacheClusterMessage$SnapshotName": "

The name of a Redis snapshot from which to restore data into the new node group (shard). The snapshot status changes to restoring while the new node group (shard) is being created.

This parameter is only valid if the Engine parameter is redis.

", - "CreateCacheClusterMessage$PreferredMaintenanceWindow": "

Specifies the weekly time range during which maintenance on the cluster is performed. It is specified as a range in the format ddd:hh24:mi-ddd:hh24:mi (24H Clock UTC). The minimum maintenance window is a 60 minute period. Valid values for ddd are:

Specifies the weekly time range during which maintenance on the cluster is performed. It is specified as a range in the format ddd:hh24:mi-ddd:hh24:mi (24H Clock UTC). The minimum maintenance window is a 60 minute period.

Valid values for ddd are:

Example: sun:23:00-mon:01:30

", + "CreateCacheClusterMessage$PreferredMaintenanceWindow": "

Specifies the weekly time range during which maintenance on the cluster is performed. It is specified as a range in the format ddd:hh24:mi-ddd:hh24:mi (24H Clock UTC). The minimum maintenance window is a 60 minute period. Valid values for ddd are:

", "CreateCacheClusterMessage$NotificationTopicArn": "

The Amazon Resource Name (ARN) of the Amazon Simple Notification Service (SNS) topic to which notifications are sent.

The Amazon SNS topic owner must be the same as the cluster owner.

", "CreateCacheClusterMessage$SnapshotWindow": "

The daily time range (in UTC) during which ElastiCache begins taking a daily snapshot of your node group (shard).

Example: 05:00-09:00

If you do not specify this parameter, ElastiCache automatically chooses an appropriate time range.

This parameter is only valid if the Engine parameter is redis.

", "CreateCacheClusterMessage$AuthToken": "

Reserved parameter. The password used to access a password protected server.

Password constraints:

For more information, see AUTH password at http://redis.io/commands/AUTH.

", @@ -1993,7 +1993,7 @@ "CreateReplicationGroupMessage$GlobalReplicationGroupId": "

The name of the Global Datastore

", "CreateReplicationGroupMessage$PrimaryClusterId": "

The identifier of the cluster that serves as the primary for this replication group. This cluster must already exist and have a status of available.

This parameter is not required if NumCacheClusters, NumNodeGroups, or ReplicasPerNodeGroup is specified.

", "CreateReplicationGroupMessage$CacheNodeType": "

The compute and memory capacity of the nodes in the node group (shard).

The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.

Additional node type info

", - "CreateReplicationGroupMessage$Engine": "

The name of the cache engine to be used for the clusters in this replication group.

", + "CreateReplicationGroupMessage$Engine": "

The name of the cache engine to be used for the clusters in this replication group. Must be Redis.

", "CreateReplicationGroupMessage$EngineVersion": "

The version number of the cache engine to be used for the clusters in this replication group. To view the supported cache engine versions, use the DescribeCacheEngineVersions operation.

Important: You can upgrade to a newer engine version (see Selecting a Cache Engine and Version) in the ElastiCache User Guide, but you cannot downgrade to an earlier engine version. If you want to use an earlier engine version, you must delete the existing cluster or replication group and create it anew with the earlier engine version.

", "CreateReplicationGroupMessage$CacheParameterGroupName": "

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

If you are running Redis version 3.2.4 or later, only one node group (shard), and want to use a default parameter group, we recommend that you specify the parameter group by name.

", "CreateReplicationGroupMessage$CacheSubnetGroupName": "

The name of the cache subnet group to be used for the replication group.

If you're going to launch your cluster in an Amazon VPC, you need to create a subnet group before you start creating a cluster. For more information, see Subnets and Subnet Groups.

", diff --git a/models/apis/elasticloadbalancingv2/2015-12-01/docs-2.json b/models/apis/elasticloadbalancingv2/2015-12-01/docs-2.json index 41a33d02b56..2d4b3261671 100644 --- a/models/apis/elasticloadbalancingv2/2015-12-01/docs-2.json +++ b/models/apis/elasticloadbalancingv2/2015-12-01/docs-2.json @@ -1582,7 +1582,7 @@ "TargetGroupAttributeKey": { "base": null, "refs": { - "TargetGroupAttribute$Key": "

The name of the attribute.

The following attribute is supported by all load balancers:

The following attributes are supported by both Application Load Balancers and Network Load Balancers:

The following attributes are supported only if the load balancer is an Application Load Balancer and the target is an instance or an IP address:

The following attribute is supported only if the load balancer is an Application Load Balancer and the target is a Lambda function:

The following attributes are supported only by Network Load Balancers:

" + "TargetGroupAttribute$Key": "

The name of the attribute.

The following attribute is supported by all load balancers:

The following attributes are supported by both Application Load Balancers and Network Load Balancers:

The following attributes are supported only if the load balancer is an Application Load Balancer and the target is an instance or an IP address:

The following attribute is supported only if the load balancer is an Application Load Balancer and the target is a Lambda function:

The following attributes are supported only by Network Load Balancers:

" } }, "TargetGroupAttributeValue": { diff --git a/models/apis/globalaccelerator/2018-08-08/api-2.json b/models/apis/globalaccelerator/2018-08-08/api-2.json index 17500a717e1..09fcb3aa516 100644 --- a/models/apis/globalaccelerator/2018-08-08/api-2.json +++ b/models/apis/globalaccelerator/2018-08-08/api-2.json @@ -930,6 +930,7 @@ "members":{ "Name":{"shape":"GenericString"}, "IpAddressType":{"shape":"IpAddressType"}, + "IpAddresses":{"shape":"IpAddresses"}, "Enabled":{"shape":"GenericBoolean"}, "IdempotencyToken":{ "shape":"IdempotencyToken", diff --git a/models/apis/globalaccelerator/2018-08-08/docs-2.json b/models/apis/globalaccelerator/2018-08-08/docs-2.json index f5c67700e8c..7994fe8786d 100644 --- a/models/apis/globalaccelerator/2018-08-08/docs-2.json +++ b/models/apis/globalaccelerator/2018-08-08/docs-2.json @@ -6,7 +6,7 @@ "AdvertiseByoipCidr": "

Advertises an IPv4 address range that is provisioned for use with your AWS resources through bring your own IP addresses (BYOIP). It can take a few minutes before traffic to the specified addresses starts routing to AWS because of propagation delays.

To stop advertising the BYOIP address range, use WithdrawByoipCidr.

For more information, see Bring Your Own IP Addresses (BYOIP) in the AWS Global Accelerator Developer Guide.

", "AllowCustomRoutingTraffic": "

Specify the Amazon EC2 instance (destination) IP addresses and ports for a VPC subnet endpoint that can receive traffic for a custom routing accelerator. You can allow traffic to all destinations in the subnet endpoint, or allow traffic to a specified list of destination IP addresses and ports in the subnet. Note that you cannot specify IP addresses or ports outside of the range that you configured for the endpoint group.

After you make changes, you can verify that the updates are complete by checking the status of your accelerator: the status changes from IN_PROGRESS to DEPLOYED.

", "CreateAccelerator": "

Create an accelerator. An accelerator includes one or more listeners that process inbound connections and direct traffic to one or more endpoint groups, each of which includes endpoints, such as Network Load Balancers.

Global Accelerator is a global service that supports endpoints in multiple AWS Regions but you must specify the US West (Oregon) Region to create or update accelerators.

", - "CreateCustomRoutingAccelerator": "

Create a custom routing accelerator. A custom routing accelerator directs traffic to one of possibly thousands of Amazon EC2 instance destinations running in a single or multiple virtual private clouds (VPC) subnet endpoints.

Be aware that, by default, all destination EC2 instances in a VPC subnet endpoint cannot receive traffic. To enable all destinations to receive traffic, or to specify individual port mappings that can receive traffic, see the AllowCustomRoutingTraffic operation.

", + "CreateCustomRoutingAccelerator": "

Create a custom routing accelerator. A custom routing accelerator directs traffic to one of possibly thousands of Amazon EC2 instance destinations running in a single or multiple virtual private clouds (VPC) subnet endpoints.

Be aware that, by default, all destination EC2 instances in a VPC subnet endpoint cannot receive traffic. To enable all destinations to receive traffic, or to specify individual port mappings that can receive traffic, see the AllowCustomRoutingTraffic operation.

Global Accelerator is a global service that supports endpoints in multiple AWS Regions but you must specify the US West (Oregon) Region to create or update accelerators.

", "CreateCustomRoutingEndpointGroup": "

Create an endpoint group for the specified listener for a custom routing accelerator. An endpoint group is a collection of endpoints in one AWS Region.

", "CreateCustomRoutingListener": "

Create a listener to process inbound connections from clients to a custom routing accelerator. Connections arrive to assigned static IP addresses on the port range that you specify.

", "CreateEndpointGroup": "

Create an endpoint group for the specified listener. An endpoint group is a collection of endpoints in one AWS Region. A resource must be valid and active when you add it as an endpoint.

", @@ -846,7 +846,8 @@ "IpAddresses": { "base": null, "refs": { - "CreateAcceleratorRequest$IpAddresses": "

Optionally, if you've added your own IP address pool to Global Accelerator (BYOIP), you can choose IP addresses from your own pool to use for the accelerator's static IP addresses when you create an accelerator. You can specify one or two addresses, separated by a comma. Do not include the /32 suffix.

Only one IP address from each of your IP address ranges can be used for each accelerator. If you specify only one IP address from your IP address range, Global Accelerator assigns a second static IP address for the accelerator from the AWS IP address pool.

Note that you can't update IP addresses for an existing accelerator. To change them, you must create a new accelerator with the new addresses.

For more information, see Bring Your Own IP Addresses (BYOIP) in the AWS Global Accelerator Developer Guide.

", + "CreateAcceleratorRequest$IpAddresses": "

Optionally, if you've added your own IP address pool to Global Accelerator (BYOIP), you can choose IP addresses from your own pool to use for the accelerator's static IP addresses when you create an accelerator. You can specify one or two addresses, separated by a space. Do not include the /32 suffix.

Only one IP address from each of your IP address ranges can be used for each accelerator. If you specify only one IP address from your IP address range, Global Accelerator assigns a second static IP address for the accelerator from the AWS IP address pool.

Note that you can't update IP addresses for an existing accelerator. To change them, you must create a new accelerator with the new addresses.

For more information, see Bring Your Own IP Addresses (BYOIP) in the AWS Global Accelerator Developer Guide.

", + "CreateCustomRoutingAcceleratorRequest$IpAddresses": "

Optionally, if you've added your own IP address pool to Global Accelerator (BYOIP), you can choose IP addresses from your own pool to use for the accelerator's static IP addresses when you create an accelerator. You can specify one or two addresses, separated by a space. Do not include the /32 suffix.

Only one IP address from each of your IP address ranges can be used for each accelerator. If you specify only one IP address from your IP address range, Global Accelerator assigns a second static IP address for the accelerator from the AWS IP address pool.

Note that you can't update IP addresses for an existing accelerator. To change them, you must create a new accelerator with the new addresses.

For more information, see Bring your own IP addresses (BYOIP) in the AWS Global Accelerator Developer Guide.

", "IpSet$IpAddresses": "

The array of IP addresses in the IP address set. An IP address set can have a maximum of two IP addresses.

" } }, diff --git a/models/apis/iotsitewise/2019-12-02/api-2.json b/models/apis/iotsitewise/2019-12-02/api-2.json index 9196216a725..70b7fb9805a 100644 --- a/models/apis/iotsitewise/2019-12-02/api-2.json +++ b/models/apis/iotsitewise/2019-12-02/api-2.json @@ -195,22 +195,6 @@ ], "endpoint":{"hostPrefix":"monitor."} }, - "CreatePresignedPortalUrl":{ - "name":"CreatePresignedPortalUrl", - "http":{ - "method":"POST", - "requestUri":"/portals/{portalId}/presigned-url", - "responseCode":200 - }, - "input":{"shape":"CreatePresignedPortalUrlRequest"}, - "output":{"shape":"CreatePresignedPortalUrlResponse"}, - "errors":[ - {"shape":"InvalidRequestException"}, - {"shape":"InternalFailureException"}, - {"shape":"ThrottlingException"} - ], - "endpoint":{"hostPrefix":"monitor."} - }, "CreateProject":{ "name":"CreateProject", "http":{ @@ -1829,26 +1813,6 @@ "ssoApplicationId":{"shape":"SSOApplicationId"} } }, - "CreatePresignedPortalUrlRequest":{ - "type":"structure", - "required":["portalId"], - "members":{ - "portalId":{ - "shape":"ID", - "location":"uri", - "locationName":"portalId" - }, - "sessionDurationSeconds":{"shape":"SessionDurationSeconds"}, - "state":{"shape":"state"} - } - }, - "CreatePresignedPortalUrlResponse":{ - "type":"structure", - "required":["presignedPortalUrl"], - "members":{ - "presignedPortalUrl":{"shape":"Url"} - } - }, "CreateProjectRequest":{ "type":"structure", "required":[ @@ -3524,11 +3488,6 @@ "exception":true, "fault":true }, - "SessionDurationSeconds":{ - "type":"integer", - "max":43200, - "min":900 - }, "TagKey":{ "type":"string", "max":128, @@ -3948,12 +3907,6 @@ "doubleValue":{"shape":"PropertyValueDoubleValue"}, "booleanValue":{"shape":"PropertyValueBooleanValue"} } - }, - "state":{ - "type":"string", - "max":512, - "min":0, - "pattern":".+" } } } diff --git a/models/apis/iotsitewise/2019-12-02/docs-2.json b/models/apis/iotsitewise/2019-12-02/docs-2.json index c8de3126646..5e6cc994b74 100644 --- a/models/apis/iotsitewise/2019-12-02/docs-2.json +++ b/models/apis/iotsitewise/2019-12-02/docs-2.json @@ -12,7 +12,6 @@ "CreateDashboard": "

Creates a dashboard in an AWS IoT SiteWise Monitor project.

", "CreateGateway": "

Creates a gateway, which is a virtual or edge device that delivers industrial data streams from local servers to AWS IoT SiteWise. For more information, see Ingesting data using a gateway in the AWS IoT SiteWise User Guide.

", "CreatePortal": "

Creates a portal, which can contain projects and dashboards. AWS IoT SiteWise Monitor uses AWS SSO or IAM to authenticate portal users and manage user permissions.

Before you can sign in to a new portal, you must add at least one identity to that portal. For more information, see Adding or removing portal administrators in the AWS IoT SiteWise User Guide.

", - "CreatePresignedPortalUrl": null, "CreateProject": "

Creates a project in the specified portal.

", "DeleteAccessPolicy": "

Deletes an access policy that grants the specified identity access to the specified AWS IoT SiteWise Monitor resource. You can use this operation to revoke access to an AWS IoT SiteWise Monitor resource.

", "DeleteAsset": "

Deletes an asset. This action can't be undone. For more information, see Deleting assets and models in the AWS IoT SiteWise User Guide.

You can't delete an asset that's associated to another asset. For more information, see DisassociateAssets.

", @@ -652,16 +651,6 @@ "refs": { } }, - "CreatePresignedPortalUrlRequest": { - "base": null, - "refs": { - } - }, - "CreatePresignedPortalUrlResponse": { - "base": null, - "refs": { - } - }, "CreateProjectRequest": { "base": null, "refs": { @@ -1100,7 +1089,6 @@ "CreateDashboardResponse$dashboardId": "

The ID of the dashboard.

", "CreateGatewayResponse$gatewayId": "

The ID of the gateway device. You can use this ID when you call other AWS IoT SiteWise APIs.

", "CreatePortalResponse$portalId": "

The ID of the created portal.

", - "CreatePresignedPortalUrlRequest$portalId": null, "CreateProjectRequest$portalId": "

The ID of the portal in which to create the project.

", "CreateProjectResponse$projectId": "

The ID of the project.

", "DashboardSummary$id": "

The ID of the dashboard.

", @@ -1790,12 +1778,6 @@ "refs": { } }, - "SessionDurationSeconds": { - "base": null, - "refs": { - "CreatePresignedPortalUrlRequest$sessionDurationSeconds": null - } - }, "TagKey": { "base": null, "refs": { @@ -2038,7 +2020,6 @@ "base": null, "refs": { "CreatePortalResponse$portalStartUrl": "

The URL for the AWS IoT SiteWise Monitor portal. You can use this URL to access portals that use AWS SSO for authentication. For portals that use IAM for authentication, you must use the AWS IoT SiteWise console to get a URL that you can use to access the portal.

", - "CreatePresignedPortalUrlResponse$presignedPortalUrl": null, "DescribePortalResponse$portalStartUrl": "

The URL for the AWS IoT SiteWise Monitor portal. You can use this URL to access portals that use AWS SSO for authentication. For portals that use IAM for authentication, you must use the AWS IoT SiteWise console to get a URL that you can use to access the portal.

", "ImageLocation$url": "

The URL where the image is available. The URL is valid for 15 minutes so that you can view and download the image

", "PortalSummary$startUrl": "

The URL for the AWS IoT SiteWise Monitor portal. You can use this URL to access portals that use AWS SSO for authentication. For portals that use IAM for authentication, you must use the AWS IoT SiteWise console to get a URL that you can use to access the portal.

" @@ -2067,12 +2048,6 @@ "refs": { "AssetPropertyValue$value": "

The value of the asset property (see Variant).

" } - }, - "state": { - "base": null, - "refs": { - "CreatePresignedPortalUrlRequest$state": null - } } } } diff --git a/models/apis/ivs/2020-07-14/api-2.json b/models/apis/ivs/2020-07-14/api-2.json index 3b8fc7045cd..e8c3750b8af 100644 --- a/models/apis/ivs/2020-07-14/api-2.json +++ b/models/apis/ivs/2020-07-14/api-2.json @@ -65,7 +65,8 @@ "name":"DeleteChannel", "http":{ "method":"POST", - "requestUri":"/DeleteChannel" + "requestUri":"/DeleteChannel", + "responseCode":204 }, "input":{"shape":"DeleteChannelRequest"}, "errors":[ @@ -95,7 +96,8 @@ "name":"DeleteStreamKey", "http":{ "method":"POST", - "requestUri":"/DeleteStreamKey" + "requestUri":"/DeleteStreamKey", + "responseCode":204 }, "input":{"shape":"DeleteStreamKeyRequest"}, "errors":[ @@ -188,7 +190,8 @@ "output":{"shape":"ListChannelsResponse"}, "errors":[ {"shape":"ValidationException"}, - {"shape":"AccessDeniedException"} + {"shape":"AccessDeniedException"}, + {"shape":"ConflictException"} ] }, "ListPlaybackKeyPairs":{ @@ -848,7 +851,10 @@ "member":{"shape":"StreamSummary"} }, "StreamMetadata":{"type":"string"}, - "StreamStartTime":{"type":"timestamp"}, + "StreamStartTime":{ + "type":"timestamp", + "timestampFormat":"iso8601" + }, "StreamState":{ "type":"string", "enum":[ diff --git a/models/apis/macie2/2020-01-01/api-2.json b/models/apis/macie2/2020-01-01/api-2.json index abf26d5370d..ce2f064be62 100644 --- a/models/apis/macie2/2020-01-01/api-2.json +++ b/models/apis/macie2/2020-01-01/api-2.json @@ -2240,6 +2240,10 @@ "shape": "ReplicationDetails", "locationName": "replicationDetails" }, + "serverSideEncryption": { + "shape": "BucketServerSideEncryption", + "locationName": "serverSideEncryption" + }, "sharedAccess": { "shape": "SharedAccess", "locationName": "sharedAccess" @@ -2309,6 +2313,19 @@ } } }, + "BucketServerSideEncryption": { + "type": "structure", + "members": { + "kmsMasterKeyId": { + "shape": "__string", + "locationName": "kmsMasterKeyId" + }, + "type": { + "shape": "Type", + "locationName": "type" + } + } + }, "BucketSortCriteria": { "type": "structure", "members": { @@ -3779,6 +3796,10 @@ "sortBy": { "shape": "UsageStatisticsSortBy", "locationName": "sortBy" + }, + "timeRange": { + "shape": "TimeRange", + "locationName": "timeRange" } } }, @@ -3792,16 +3813,30 @@ "records": { "shape": "__listOfUsageRecord", "locationName": "records" + }, + "timeRange": { + "shape": "TimeRange", + "locationName": "timeRange" } } }, "GetUsageTotalsRequest": { "type": "structure", - "members": {} + "members": { + "timeRange": { + "shape": "__string", + "location": "querystring", + "locationName": "timeRange" + } + } }, "GetUsageTotalsResponse": { "type": "structure", "members": { + "timeRange": { + "shape": "TimeRange", + "locationName": "timeRange" + }, "usageTotals": { "shape": "__listOfUsageTotal", "locationName": "usageTotals" @@ -5231,6 +5266,21 @@ "httpStatusCode": 429 } }, + "TimeRange": { + "type": "string", + "enum": [ + "MONTH_TO_DATE", + "PAST_30_DAYS" + ] + }, + "Type": { + "type": "string", + "enum": [ + "NONE", + "AES256", + "aws:kms" + ] + }, "Unit": { "type": "string", "enum": [ diff --git a/models/apis/macie2/2020-01-01/docs-2.json b/models/apis/macie2/2020-01-01/docs-2.json index 4316c13ecac..aae2ea93298 100644 --- a/models/apis/macie2/2020-01-01/docs-2.json +++ b/models/apis/macie2/2020-01-01/docs-2.json @@ -76,7 +76,7 @@ } }, "AccountLevelPermissions" : { - "base" : "

Provides information about account-level permissions settings that apply to an S3 bucket.

", + "base" : "

Provides information about the account-level permissions settings that apply to an S3 bucket.

", "refs" : { "BucketPermissionConfiguration$AccountLevelPermissions" : "

The account-level permissions settings that apply to the bucket.

" } @@ -134,7 +134,7 @@ "BlockPublicAccess" : { "base" : "

Provides information about the block public access settings for an S3 bucket. These settings can apply to a bucket at the account level or bucket level. For detailed information about each setting, see Blocking public access to your Amazon S3 storage in the Amazon Simple Storage Service User Guide.

", "refs" : { - "AccountLevelPermissions$BlockPublicAccess" : "

The block public access settings for the bucket.

", + "AccountLevelPermissions$BlockPublicAccess" : "

The block public access settings for the AWS account that owns the bucket.

", "BucketLevelPermissions$BlockPublicAccess" : "

The block public access settings for the bucket.

" } }, @@ -145,9 +145,9 @@ } }, "BucketCountByEncryptionType" : { - "base" : "

Provides information about the number of S3 buckets that use certain types of server-side encryption or don't encrypt objects by default.

", + "base" : "

Provides information about the number of S3 buckets that use certain types of server-side encryption by default or don't encrypt new objects by default.

", "refs" : { - "GetBucketStatisticsResponse$BucketCountByEncryptionType" : "

The total number of buckets, grouped by server-side encryption type. This object also reports the total number of buckets that don't encrypt objects by default.

" + "GetBucketStatisticsResponse$BucketCountByEncryptionType" : "

The total number of buckets, grouped by default server-side encryption type. This object also reports the total number of buckets that don't encrypt new objects by default.

" } }, "BucketCountBySharedAccessType" : { @@ -195,10 +195,16 @@ "BucketPublicAccess" : { "base" : "

Provides information about the permissions settings that determine whether an S3 bucket is publicly accessible.

", "refs" : { - "BucketMetadata$PublicAccess" : "

Specifies whether the bucket is publicly accessible. If this value is true, an access control list (ACL), bucket policy, or block public access settings allow the bucket to be accessed by the general public.

", + "BucketMetadata$PublicAccess" : "

Specifies whether the bucket is publicly accessible due to the combination of permissions settings that apply to the bucket, and provides information about those settings.

", "S3Bucket$PublicAccess" : "

The permissions settings that determine whether the bucket is publicly accessible.

" } }, + "BucketServerSideEncryption" : { + "base" : "

Provides information about the default server-side encryption settings for an S3 bucket. For detailed information about these settings, see Setting default server-side encryption behavior for Amazon S3 buckets in the Amazon Simple Storage Service User Guide.

", + "refs" : { + "BucketMetadata$ServerSideEncryption" : "

Specifies whether the bucket encrypts new objects by default and, if so, the type of server-side encryption that's used.

" + } + }, "BucketSortCriteria" : { "base" : "

Specifies criteria for sorting the results of a query for information about S3 buckets.

", "refs" : { @@ -304,7 +310,7 @@ } }, "Currency" : { - "base" : "

The type of currency that data for a usage metric is reported in. Possible values are:

", + "base" : "

The type of currency that the data for an Amazon Macie usage metric is reported in. Possible values are:

", "refs" : { "UsageByAccount$Currency" : "

The type of currency that the value for the metric (estimatedCost) is reported in.

", "UsageTotal$Currency" : "

The type of currency that the value for the metric (estimatedCost) is reported in.

" @@ -567,15 +573,15 @@ "refs" : { } }, "GetUsageStatisticsRequest" : { - "base" : "

Specifies criteria for filtering, sorting, and paginating the results of a query for quotas and aggregated usage data for one or more accounts.

", + "base" : "

Specifies criteria for filtering, sorting, and paginating the results of a query for quotas and aggregated usage data for one or more Amazon Macie accounts.

", "refs" : { } }, "GetUsageStatisticsResponse" : { - "base" : "

Provides the results of a query that retrieved quotas and aggregated usage data for one or more accounts.

", + "base" : "

Provides the results of a query that retrieved quotas and aggregated usage data for one or more Amazon Macie accounts.

", "refs" : { } }, "GetUsageTotalsResponse" : { - "base" : "

Provides the results of a query that retrieved aggregated usage data for an account during the past 30 days.

", + "base" : "

Provides the results of a query that retrieved aggregated usage data for an Amazon Macie account.

", "refs" : { } }, "GroupBy" : { @@ -1011,7 +1017,7 @@ } }, "ServiceLimit" : { - "base" : "

Specifies a current quota for an account.

", + "base" : "

Specifies a current quota for an Amazon Macie account.

", "refs" : { "UsageByAccount$ServiceLimit" : "

The current value for the quota that corresponds to the metric specified by the type field.

" } @@ -1137,6 +1143,20 @@ "base" : "

Provides information about an error that occurred because too many requests were sent during a certain amount of time.

", "refs" : { } }, + "TimeRange" : { + "base" : "

An inclusive time period that Amazon Macie usage data applies to. Possible values are:

", + "refs" : { + "GetUsageStatisticsRequest$TimeRange" : "

The inclusive time period to query usage data for. Valid values are: MONTH_TO_DATE, for the current calendar month to date; and, PAST_30_DAYS, for the preceding 30 days. If you don't specify a value, Amazon Macie provides usage data for the preceding 30 days.

", + "GetUsageStatisticsResponse$TimeRange" : "

The inclusive time period that the usage data applies to. Possible values are: MONTH_TO_DATE, for the current calendar month to date; and, PAST_30_DAYS, for the preceding 30 days.

", + "GetUsageTotalsResponse$TimeRange" : "

The inclusive time period that the usage data applies to. Possible values are: MONTH_TO_DATE, for the current calendar month to date; and, PAST_30_DAYS, for the preceding 30 days.

" + } + }, + "Type" : { + "base" : null, + "refs" : { + "BucketServerSideEncryption$Type" : "

The type of server-side encryption that's used by default when storing new objects in the bucket. Possible values are:

" + } + }, "Unit" : { "base" : null, "refs" : { @@ -1178,58 +1198,58 @@ "refs" : { } }, "UsageByAccount" : { - "base" : "

Provides data for a specific usage metric and the corresponding quota for an account. The value for the metric is an aggregated value that reports usage during the past 30 days.

", + "base" : "

Provides data for a specific usage metric and the corresponding quota for an Amazon Macie account.

", "refs" : { "__listOfUsageByAccount$member" : null } }, "UsageRecord" : { - "base" : "

Provides quota and aggregated usage data for an account.

", + "base" : "

Provides quota and aggregated usage data for an Amazon Macie account.

", "refs" : { "__listOfUsageRecord$member" : null } }, "UsageStatisticsFilter" : { - "base" : "

Specifies a condition for filtering the results of a query for account quotas and usage data.

", + "base" : "

Specifies a condition for filtering the results of a query for the quotas and usage data that applies to one or more Amazon Macie accounts.

", "refs" : { "__listOfUsageStatisticsFilter$member" : null } }, "UsageStatisticsFilterComparator" : { - "base" : "

The operator to use in a condition that filters the results of a query for account quotas and usage data. Valid values are:

", + "base" : "

The operator to use in a condition that filters the results of a query for Amazon Macie account quotas and usage data. Valid values are:

", "refs" : { "UsageStatisticsFilter$Comparator" : "

The operator to use in the condition. If the value for the key property is accountId, this value must be CONTAINS. If the value for the key property is any other supported field, this value can be EQ, GT, GTE, LT, LTE, or NE.

" } }, "UsageStatisticsFilterKey" : { - "base" : "

The field to use in a condition that filters the results of a query for account quotas and usage data. Valid values are:

", + "base" : "

The field to use in a condition that filters the results of a query for Amazon Macie account quotas and usage data. Valid values are:

", "refs" : { "UsageStatisticsFilter$Key" : "

The field to use in the condition.

" } }, "UsageStatisticsSortBy" : { - "base" : "

Specifies criteria for sorting the results of a query for account quotas and usage data.

", + "base" : "

Specifies criteria for sorting the results of a query for Amazon Macie account quotas and usage data.

", "refs" : { "GetUsageStatisticsRequest$SortBy" : "

The criteria to use to sort the query results.

" } }, "UsageStatisticsSortKey" : { - "base" : "

The field to use to sort the results of a query for account quotas and usage data. Valid values are:

", + "base" : "

The field to use to sort the results of a query for Amazon Macie account quotas and usage data. Valid values are:

", "refs" : { "UsageStatisticsSortBy$Key" : "

The field to sort the results by.

" } }, "UsageTotal" : { - "base" : "

Provides aggregated data for a usage metric. The value for the metric reports usage data for an account during the past 30 days.

", + "base" : "

Provides aggregated data for an Amazon Macie usage metric. The value for the metric reports estimated usage data for an account for the preceding 30 days or the current calendar month to date, depending on the time period (timeRange) specified in the request.

", "refs" : { "__listOfUsageTotal$member" : null } }, "UsageType" : { - "base" : "

The name of a usage metric for an account. Possible values are:

", + "base" : "

The name of an Amazon Macie usage metric for an account. Possible values are:

", "refs" : { - "UsageByAccount$Type" : "

The name of the metric. Possible values are: DATA_INVENTORY_EVALUATION, for monitoring S3 buckets; and, SENSITIVE_DATA_DISCOVERY, for analyzing sensitive data.

", - "UsageTotal$Type" : "

The name of the metric. Possible values are: DATA_INVENTORY_EVALUATION, for monitoring S3 buckets; and, SENSITIVE_DATA_DISCOVERY, for analyzing sensitive data.

" + "UsageByAccount$Type" : "

The name of the metric. Possible values are: DATA_INVENTORY_EVALUATION, for monitoring S3 buckets; and, SENSITIVE_DATA_DISCOVERY, for analyzing S3 objects to detect sensitive data.

", + "UsageTotal$Type" : "

The name of the metric. Possible values are: DATA_INVENTORY_EVALUATION, for monitoring S3 buckets; and, SENSITIVE_DATA_DISCOVERY, for analyzing S3 objects to detect sensitive data.

" } }, "UserIdentity" : { @@ -1448,7 +1468,7 @@ "__listOfUsageStatisticsFilter" : { "base" : null, "refs" : { - "GetUsageStatisticsRequest$FilterBy" : "

An array of objects, one for each condition to use to filter the query results. If the array contains more than one object, Amazon Macie uses an AND operator to join the conditions specified by the objects.

" + "GetUsageStatisticsRequest$FilterBy" : "

An array of objects, one for each condition to use to filter the query results. If you specify more than one condition, Amazon Macie uses an AND operator to join the conditions.

" } }, "__listOfUsageTotal" : { @@ -1494,9 +1514,9 @@ "BucketCountByEffectivePermission$PubliclyReadable" : "

The total number of buckets that allow the general public to have read access to the bucket.

", "BucketCountByEffectivePermission$PubliclyWritable" : "

The total number of buckets that allow the general public to have write access to the bucket.

", "BucketCountByEffectivePermission$Unknown" : "

The total number of buckets that Amazon Macie wasn't able to evaluate permissions settings for. Macie can't determine whether these buckets are publicly accessible.

", - "BucketCountByEncryptionType$KmsManaged" : "

The total number of buckets that use an AWS Key Management Service (AWS KMS) customer master key (CMK) by default to encrypt objects. These buckets use AWS managed AWS KMS (AWS-KMS) encryption or customer managed AWS KMS (SSE-KMS) encryption.

", - "BucketCountByEncryptionType$S3Managed" : "

The total number of buckets that use an Amazon S3 managed key by default to encrypt objects. These buckets use Amazon S3 managed (SSE-S3) encryption.

", - "BucketCountByEncryptionType$Unencrypted" : "

The total number of buckets that don't encrypt objects by default. Default encryption is disabled for these buckets.

", + "BucketCountByEncryptionType$KmsManaged" : "

The total number of buckets that use an AWS Key Management Service (AWS KMS) customer master key (CMK) to encrypt new objects by default. These buckets use AWS managed AWS KMS encryption (AWS-KMS) or customer managed AWS KMS encryption (SSE-KMS).

", + "BucketCountByEncryptionType$S3Managed" : "

The total number of buckets that use an Amazon S3 managed key to encrypt new objects by default. These buckets use Amazon S3 managed encryption (SSE-S3).

", + "BucketCountByEncryptionType$Unencrypted" : "

The total number of buckets that don't encrypt new objects by default. Default encryption is disabled for these buckets.

", "BucketCountBySharedAccessType$External" : "

The total number of buckets that are shared with an AWS account that isn't part of the same Amazon Macie organization.

", "BucketCountBySharedAccessType$Internal" : "

The total number of buckets that are shared with an AWS account that's part of the same Amazon Macie organization.

", "BucketCountBySharedAccessType$NotShared" : "

The total number of buckets that aren't shared with other AWS accounts.

", @@ -1529,9 +1549,9 @@ "GetBucketStatisticsResponse$SizeInBytesCompressed" : "

The total compressed storage size, in bytes, of the buckets.

", "GetInvitationsCountResponse$InvitationsCount" : "

The total number of invitations that were received by the account, not including the currently accepted invitation.

", "GroupCount$Count" : "

The total number of findings in the group of query results.

", - "ObjectCountByEncryptionType$CustomerManaged" : "

The total number of objects that are encrypted using a customer-managed key. The objects use customer-provided server-side (SSE-C) encryption.

", - "ObjectCountByEncryptionType$KmsManaged" : "

The total number of objects that are encrypted using an AWS Key Management Service (AWS KMS) customer master key (CMK). The objects use AWS managed AWS KMS (AWS-KMS) encryption or customer managed AWS KMS (SSE-KMS) encryption.

", - "ObjectCountByEncryptionType$S3Managed" : "

The total number of objects that are encrypted using an Amazon S3 managed key. The objects use Amazon S3 managed (SSE-S3) encryption.

", + "ObjectCountByEncryptionType$CustomerManaged" : "

The total number of objects that are encrypted using a customer-managed key. The objects use customer-provided server-side encryption (SSE-C).

", + "ObjectCountByEncryptionType$KmsManaged" : "

The total number of objects that are encrypted using an AWS Key Management Service (AWS KMS) customer master key (CMK). The objects use AWS managed AWS KMS encryption (AWS-KMS) or customer managed AWS KMS encryption (SSE-KMS).

", + "ObjectCountByEncryptionType$S3Managed" : "

The total number of objects that are encrypted using an Amazon S3 managed key. The objects use Amazon S3 managed encryption (SSE-S3).

", "ObjectCountByEncryptionType$Unencrypted" : "

The total number of objects that aren't encrypted or use client-side encryption.

", "ObjectLevelStatistics$FileType" : "

The total storage size (in bytes) or number of objects that Amazon Macie can't analyze because the objects don't have a file name extension for a supported file or storage format.

", "ObjectLevelStatistics$StorageClass" : "

The total storage size (in bytes) or number of objects that Amazon Macie can't analyze because the objects use an unsupported storage class.

", @@ -1574,6 +1594,7 @@ "BucketMetadata$BucketArn" : "

The Amazon Resource Name (ARN) of the bucket.

", "BucketMetadata$BucketName" : "

The name of the bucket.

", "BucketMetadata$Region" : "

The AWS Region that hosts the bucket.

", + "BucketServerSideEncryption$KmsMasterKeyId" : "

The Amazon Resource Name (ARN) or unique identifier (key ID) for the AWS Key Management Service (AWS KMS) customer master key (CMK) that's used by default to encrypt objects that are added to the bucket. This value is null if the bucket uses an Amazon S3 managed key to encrypt new objects or the bucket doesn't encrypt new objects by default.

", "BucketSortCriteria$AttributeName" : "

The name of the property to sort the results by. This value can be the name of any property that Amazon Macie defines as bucket metadata, such as bucketName or accountId.

", "Cell$CellReference" : "

The location of the cell, as an absolute cell reference, that contains the data. For example, Sheet2!C5 for cell C5 on Sheet2 in a Microsoft Excel workbook. This value is null for CSV and TSV files.

", "Cell$ColumnName" : "

The name of the column that contains the data, if available.

", diff --git a/models/endpoints/endpoints.json b/models/endpoints/endpoints.json index 232a8f374f9..cbf7808ea32 100644 --- a/models/endpoints/endpoints.json +++ b/models/endpoints/endpoints.json @@ -7171,6 +7171,16 @@ }, "isRegionalized" : true }, + "guardduty" : { + "defaults" : { + "protocols" : [ "https" ] + }, + "endpoints" : { + "cn-north-1" : { }, + "cn-northwest-1" : { } + }, + "isRegionalized" : true + }, "health" : { "endpoints" : { "cn-north-1" : { }, diff --git a/service/cloudtrail/api.go b/service/cloudtrail/api.go index 69a3d781032..b6d64a4eeda 100644 --- a/service/cloudtrail/api.go +++ b/service/cloudtrail/api.go @@ -439,6 +439,12 @@ func (c *CloudTrail) DeleteTrailRequest(input *DeleteTrailInput) (req *request.R // an organization trail in a required service. For more information, see Prepare // For Creating a Trail For Your Organization (https://docs.aws.amazon.com/awscloudtrail/latest/userguide/creating-an-organizational-trail-prepare.html). // +// * ConflictException +// This exception is thrown when the specified resource is not ready for an +// operation. This can occur when you try to run an operation on a trail before +// CloudTrail has time to fully load the trail. If this exception occurs, wait +// a few minutes, and then try the operation again. +// // See also, https://docs.aws.amazon.com/goto/WebAPI/cloudtrail-2013-11-01/DeleteTrail func (c *CloudTrail) DeleteTrail(input *DeleteTrailInput) (*DeleteTrailOutput, error) { req, out := c.DeleteTrailRequest(input) @@ -1926,6 +1932,13 @@ func (c *CloudTrail) PutInsightSelectorsRequest(input *PutInsightSelectorsInput) // This exception is thrown when the policy on the S3 bucket or KMS key is not // sufficient. // +// * S3BucketDoesNotExistException +// This exception is thrown when the specified S3 bucket does not exist. +// +// * KmsException +// This exception is thrown when there is an issue with the specified KMS key +// and the trail can’t be updated. +// // * UnsupportedOperationException // This exception is thrown when the requested operation is not supported. // @@ -2857,10 +2870,10 @@ type AdvancedFieldSelector struct { // value must be Management or Data. // // * resources.type - This field is required. resources.type can only use - // the Equals operator, and the value can be one of the following: AWS::S3::Object - // or AWS::Lambda::Function. You can have only one resources.type field - // per selector. To log data events on more than one resource type, add another - // selector. + // the Equals operator, and the value can be one of the following: AWS::S3::Object, + // AWS::Lambda::Function, or AWS::S3Outposts::Object. You can have only one + // resources.type field per selector. To log data events on more than one + // resource type, add another selector. // // * resources.ARN - You can use any operator with resources.ARN, but if // you use Equals or NotEquals, the value must exactly match the ARN of a @@ -2870,6 +2883,8 @@ type AdvancedFieldSelector struct { // intentional; do not exclude it. arn:partition:s3:::bucket_name/ arn:partition:s3:::bucket_name/object_or_file_name/ // When resources.type equals AWS::Lambda::Function, and the operator is // set to Equals or NotEquals, the ARN must be in the following format: arn:partition:lambda:region:account_ID:function:function_name + // When resources.type equals AWS::S3Outposts::Object, and the operator is + // set to Equals or NotEquals, the ARN must be in the following format: arn:partition:s3-outposts:region:>account_ID:object_path // // Field is a required field Field *string `min:"1" type:"string" required:"true"` @@ -3091,6 +3106,65 @@ func (s *CloudWatchLogsDeliveryUnavailableException) RequestID() string { return s.RespMetadata.RequestID } +// This exception is thrown when the specified resource is not ready for an +// operation. This can occur when you try to run an operation on a trail before +// CloudTrail has time to fully load the trail. If this exception occurs, wait +// a few minutes, and then try the operation again. +type ConflictException struct { + _ struct{} `type:"structure"` + RespMetadata protocol.ResponseMetadata `json:"-" xml:"-"` + + Message_ *string `locationName:"message" type:"string"` +} + +// String returns the string representation +func (s ConflictException) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ConflictException) GoString() string { + return s.String() +} + +func newErrorConflictException(v protocol.ResponseMetadata) error { + return &ConflictException{ + RespMetadata: v, + } +} + +// Code returns the exception type name. +func (s *ConflictException) Code() string { + return "ConflictException" +} + +// Message returns the exception's message. +func (s *ConflictException) Message() string { + if s.Message_ != nil { + return *s.Message_ + } + return "" +} + +// OrigErr always returns nil, satisfies awserr.Error interface. +func (s *ConflictException) OrigErr() error { + return nil +} + +func (s *ConflictException) Error() string { + return fmt.Sprintf("%s: %s", s.Code(), s.Message()) +} + +// Status code returns the HTTP status code for the request's response error. +func (s *ConflictException) StatusCode() int { + return s.RespMetadata.StatusCode +} + +// RequestID returns the service's response RequestID for request. +func (s *ConflictException) RequestID() string { + return s.RespMetadata.RequestID +} + // Specifies the settings for each trail. type CreateTrailInput struct { _ struct{} `type:"structure"` @@ -3496,6 +3570,9 @@ type DataResource struct { // The resource type in which you want to log data events. You can specify AWS::S3::Object // or AWS::Lambda::Function resources. + // + // The AWS::S3Outposts::Object resource type is not valid in basic event selectors. + // To log data events on this resource type, use advanced event selectors. Type *string `type:"string"` // An array of Amazon Resource Name (ARN) strings or partial ARN strings for diff --git a/service/cloudtrail/errors.go b/service/cloudtrail/errors.go index 1872ad7259b..e66ef96b023 100644 --- a/service/cloudtrail/errors.go +++ b/service/cloudtrail/errors.go @@ -40,6 +40,15 @@ const ( // Cannot set a CloudWatch Logs delivery for this region. ErrCodeCloudWatchLogsDeliveryUnavailableException = "CloudWatchLogsDeliveryUnavailableException" + // ErrCodeConflictException for service response error code + // "ConflictException". + // + // This exception is thrown when the specified resource is not ready for an + // operation. This can occur when you try to run an operation on a trail before + // CloudTrail has time to fully load the trail. If this exception occurs, wait + // a few minutes, and then try the operation again. + ErrCodeConflictException = "ConflictException" + // ErrCodeInsightNotEnabledException for service response error code // "InsightNotEnabledException". // @@ -342,6 +351,7 @@ var exceptionFromCode = map[string]func(protocol.ResponseMetadata) error{ "CloudTrailAccessNotEnabledException": newErrorAccessNotEnabledException, "CloudTrailInvalidClientTokenIdException": newErrorCloudTrailInvalidClientTokenIdException, "CloudWatchLogsDeliveryUnavailableException": newErrorCloudWatchLogsDeliveryUnavailableException, + "ConflictException": newErrorConflictException, "InsightNotEnabledException": newErrorInsightNotEnabledException, "InsufficientDependencyServiceAccessPermissionException": newErrorInsufficientDependencyServiceAccessPermissionException, "InsufficientEncryptionPolicyException": newErrorInsufficientEncryptionPolicyException, diff --git a/service/dataexchange/api.go b/service/dataexchange/api.go index 9eb037715ac..7c36c160bf9 100644 --- a/service/dataexchange/api.go +++ b/service/dataexchange/api.go @@ -2851,8 +2851,8 @@ func (s *CreateDataSetOutput) SetUpdatedAt(v time.Time) *CreateDataSetOutput { // The CreateJob request. AWS Data Exchange Jobs are asynchronous import or // export operations used to create or copy assets. A data set owner can both -// import and export as they see fit. Someone with an entitlement to a data -// set can only export. Jobs are deleted 90 days after they are created. Created +// import and export assets. A subscriber with an entitlement to a data set +// can only export. Jobs are deleted 90 days after they are created. Created // jobs must be started with the StartJob operation. type CreateJobInput struct { _ struct{} `type:"structure"` @@ -3792,6 +3792,129 @@ func (s *ExportAssetsToS3ResponseDetails) SetRevisionId(v string) *ExportAssetsT return s } +// Details of the operation to be performed by the job. +type ExportRevisionsToS3RequestDetails struct { + _ struct{} `type:"structure"` + + // The unique identifier for the data set associated with this export job. + // + // DataSetId is a required field + DataSetId *string `type:"string" required:"true"` + + // Encryption configuration for the export job. + Encryption *ExportServerSideEncryption `type:"structure"` + + // The destination for the revision. + // + // RevisionDestinations is a required field + RevisionDestinations []*RevisionDestinationEntry `type:"list" required:"true"` +} + +// String returns the string representation +func (s ExportRevisionsToS3RequestDetails) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ExportRevisionsToS3RequestDetails) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *ExportRevisionsToS3RequestDetails) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "ExportRevisionsToS3RequestDetails"} + if s.DataSetId == nil { + invalidParams.Add(request.NewErrParamRequired("DataSetId")) + } + if s.RevisionDestinations == nil { + invalidParams.Add(request.NewErrParamRequired("RevisionDestinations")) + } + if s.Encryption != nil { + if err := s.Encryption.Validate(); err != nil { + invalidParams.AddNested("Encryption", err.(request.ErrInvalidParams)) + } + } + if s.RevisionDestinations != nil { + for i, v := range s.RevisionDestinations { + if v == nil { + continue + } + if err := v.Validate(); err != nil { + invalidParams.AddNested(fmt.Sprintf("%s[%v]", "RevisionDestinations", i), err.(request.ErrInvalidParams)) + } + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetDataSetId sets the DataSetId field's value. +func (s *ExportRevisionsToS3RequestDetails) SetDataSetId(v string) *ExportRevisionsToS3RequestDetails { + s.DataSetId = &v + return s +} + +// SetEncryption sets the Encryption field's value. +func (s *ExportRevisionsToS3RequestDetails) SetEncryption(v *ExportServerSideEncryption) *ExportRevisionsToS3RequestDetails { + s.Encryption = v + return s +} + +// SetRevisionDestinations sets the RevisionDestinations field's value. +func (s *ExportRevisionsToS3RequestDetails) SetRevisionDestinations(v []*RevisionDestinationEntry) *ExportRevisionsToS3RequestDetails { + s.RevisionDestinations = v + return s +} + +// Details about the export revisions to Amazon S3 response. +type ExportRevisionsToS3ResponseDetails struct { + _ struct{} `type:"structure"` + + // The unique identifier for the data set associated with this export job. + // + // DataSetId is a required field + DataSetId *string `type:"string" required:"true"` + + // Encryption configuration of the export job. + Encryption *ExportServerSideEncryption `type:"structure"` + + // The destination in Amazon S3 where the revision is exported. + // + // RevisionDestinations is a required field + RevisionDestinations []*RevisionDestinationEntry `type:"list" required:"true"` +} + +// String returns the string representation +func (s ExportRevisionsToS3ResponseDetails) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s ExportRevisionsToS3ResponseDetails) GoString() string { + return s.String() +} + +// SetDataSetId sets the DataSetId field's value. +func (s *ExportRevisionsToS3ResponseDetails) SetDataSetId(v string) *ExportRevisionsToS3ResponseDetails { + s.DataSetId = &v + return s +} + +// SetEncryption sets the Encryption field's value. +func (s *ExportRevisionsToS3ResponseDetails) SetEncryption(v *ExportServerSideEncryption) *ExportRevisionsToS3ResponseDetails { + s.Encryption = v + return s +} + +// SetRevisionDestinations sets the RevisionDestinations field's value. +func (s *ExportRevisionsToS3ResponseDetails) SetRevisionDestinations(v []*RevisionDestinationEntry) *ExportRevisionsToS3ResponseDetails { + s.RevisionDestinations = v + return s +} + // Encryption configuration of the export job. Includes the encryption type // as well as the AWS KMS key. The KMS key is only necessary if you chose the // KMS encryption type. @@ -5463,6 +5586,9 @@ type RequestDetails struct { // Details about the export to Amazon S3 request. ExportAssetsToS3 *ExportAssetsToS3RequestDetails `type:"structure"` + // Details about the export to Amazon S3 request. + ExportRevisionsToS3 *ExportRevisionsToS3RequestDetails `type:"structure"` + // Details about the import from signed URL request. ImportAssetFromSignedUrl *ImportAssetFromSignedUrlRequestDetails `type:"structure"` @@ -5493,6 +5619,11 @@ func (s *RequestDetails) Validate() error { invalidParams.AddNested("ExportAssetsToS3", err.(request.ErrInvalidParams)) } } + if s.ExportRevisionsToS3 != nil { + if err := s.ExportRevisionsToS3.Validate(); err != nil { + invalidParams.AddNested("ExportRevisionsToS3", err.(request.ErrInvalidParams)) + } + } if s.ImportAssetFromSignedUrl != nil { if err := s.ImportAssetFromSignedUrl.Validate(); err != nil { invalidParams.AddNested("ImportAssetFromSignedUrl", err.(request.ErrInvalidParams)) @@ -5522,6 +5653,12 @@ func (s *RequestDetails) SetExportAssetsToS3(v *ExportAssetsToS3RequestDetails) return s } +// SetExportRevisionsToS3 sets the ExportRevisionsToS3 field's value. +func (s *RequestDetails) SetExportRevisionsToS3(v *ExportRevisionsToS3RequestDetails) *RequestDetails { + s.ExportRevisionsToS3 = v + return s +} + // SetImportAssetFromSignedUrl sets the ImportAssetFromSignedUrl field's value. func (s *RequestDetails) SetImportAssetFromSignedUrl(v *ImportAssetFromSignedUrlRequestDetails) *RequestDetails { s.ImportAssetFromSignedUrl = v @@ -5607,6 +5744,9 @@ type ResponseDetails struct { // Details for the export to Amazon S3 response. ExportAssetsToS3 *ExportAssetsToS3ResponseDetails `type:"structure"` + // Details for the export revisions to Amazon S3 response. + ExportRevisionsToS3 *ExportRevisionsToS3ResponseDetails `type:"structure"` + // Details for the import from signed URL response. ImportAssetFromSignedUrl *ImportAssetFromSignedUrlResponseDetails `type:"structure"` @@ -5636,6 +5776,12 @@ func (s *ResponseDetails) SetExportAssetsToS3(v *ExportAssetsToS3ResponseDetails return s } +// SetExportRevisionsToS3 sets the ExportRevisionsToS3 field's value. +func (s *ResponseDetails) SetExportRevisionsToS3(v *ExportRevisionsToS3ResponseDetails) *ResponseDetails { + s.ExportRevisionsToS3 = v + return s +} + // SetImportAssetFromSignedUrl sets the ImportAssetFromSignedUrl field's value. func (s *ResponseDetails) SetImportAssetFromSignedUrl(v *ImportAssetFromSignedUrlResponseDetails) *ResponseDetails { s.ImportAssetFromSignedUrl = v @@ -5648,6 +5794,70 @@ func (s *ResponseDetails) SetImportAssetsFromS3(v *ImportAssetsFromS3ResponseDet return s } +// The destination where the assets in the revision will be exported. +type RevisionDestinationEntry struct { + _ struct{} `type:"structure"` + + // The S3 bucket that is the destination for the assets in the revision. + // + // Bucket is a required field + Bucket *string `type:"string" required:"true"` + + // A string representing the pattern for generated names of the individual assets + // in the revision. For more information about key patterns, see Key patterns + // when exporting revisions (https://docs.aws.amazon.com/data-exchange/latest/userguide/jobs.html#revision-export-keypatterns). + KeyPattern *string `type:"string"` + + // The unique identifier for the revision. + // + // RevisionId is a required field + RevisionId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s RevisionDestinationEntry) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RevisionDestinationEntry) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RevisionDestinationEntry) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RevisionDestinationEntry"} + if s.Bucket == nil { + invalidParams.Add(request.NewErrParamRequired("Bucket")) + } + if s.RevisionId == nil { + invalidParams.Add(request.NewErrParamRequired("RevisionId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetBucket sets the Bucket field's value. +func (s *RevisionDestinationEntry) SetBucket(v string) *RevisionDestinationEntry { + s.Bucket = &v + return s +} + +// SetKeyPattern sets the KeyPattern field's value. +func (s *RevisionDestinationEntry) SetKeyPattern(v string) *RevisionDestinationEntry { + s.KeyPattern = &v + return s +} + +// SetRevisionId sets the RevisionId field's value. +func (s *RevisionDestinationEntry) SetRevisionId(v string) *RevisionDestinationEntry { + s.RevisionId = &v + return s +} + // A revision is a container for one or more assets. type RevisionEntry struct { _ struct{} `type:"structure"` @@ -6899,6 +7109,9 @@ const ( // TypeExportAssetToSignedUrl is a Type enum value TypeExportAssetToSignedUrl = "EXPORT_ASSET_TO_SIGNED_URL" + + // TypeExportRevisionsToS3 is a Type enum value + TypeExportRevisionsToS3 = "EXPORT_REVISIONS_TO_S3" ) // Type_Values returns all elements of the Type enum @@ -6908,5 +7121,6 @@ func Type_Values() []string { TypeImportAssetFromSignedUrl, TypeExportAssetsToS3, TypeExportAssetToSignedUrl, + TypeExportRevisionsToS3, } } diff --git a/service/elasticache/api.go b/service/elasticache/api.go index 8792bcdcaf4..8c86d7deca6 100644 --- a/service/elasticache/api.go +++ b/service/elasticache/api.go @@ -2193,7 +2193,8 @@ func (c *ElastiCache) DeleteCacheSubnetGroupRequest(input *DeleteCacheSubnetGrou // // Deletes a cache subnet group. // -// You cannot delete a cache subnet group if it is associated with any clusters. +// You cannot delete a default cache subnet group or one that is associated +// with any clusters. // // 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 @@ -6316,7 +6317,7 @@ func (c *ElastiCache) ModifyReplicationGroupShardConfigurationRequest(input *Mod // ModifyReplicationGroupShardConfiguration API operation for Amazon ElastiCache. // // Modifies a replication group's shards (node groups) by allowing you to add -// shards, remove shards, or rebalance the keyspaces among exisiting shards. +// shards, remove shards, or rebalance the keyspaces among existing shards. // // 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 @@ -9298,28 +9299,6 @@ type CreateCacheClusterInput struct { // performed. It is specified as a range in the format ddd:hh24:mi-ddd:hh24:mi // (24H Clock UTC). The minimum maintenance window is a 60 minute period. Valid // values for ddd are: - // - // Specifies the weekly time range during which maintenance on the cluster is - // performed. It is specified as a range in the format ddd:hh24:mi-ddd:hh24:mi - // (24H Clock UTC). The minimum maintenance window is a 60 minute period. - // - // Valid values for ddd are: - // - // * sun - // - // * mon - // - // * tue - // - // * wed - // - // * thu - // - // * fri - // - // * sat - // - // Example: sun:23:00-mon:01:30 PreferredMaintenanceWindow *string `type:"string"` // The outpost ARN in which the cache cluster is created. @@ -10090,7 +10069,7 @@ type CreateReplicationGroupInput struct { CacheSubnetGroupName *string `type:"string"` // The name of the cache engine to be used for the clusters in this replication - // group. + // group. Must be Redis. Engine *string `type:"string"` // The version number of the cache engine to be used for the clusters in this diff --git a/service/elbv2/api.go b/service/elbv2/api.go index 03a86bff8b7..728f538ac53 100644 --- a/service/elbv2/api.go +++ b/service/elbv2/api.go @@ -8965,8 +8965,8 @@ type TargetGroupAttribute struct { // The value is true or false. The default is false. // // * stickiness.type - The type of sticky sessions. The possible values are - // lb_cookie for Application Load Balancers or source_ip for Network Load - // Balancers. + // lb_cookie and app_cookie for Application Load Balancers or source_ip for + // Network Load Balancers. // // The following attributes are supported only if the load balancer is an Application // Load Balancer and the target is an instance or an IP address: @@ -8981,6 +8981,12 @@ type TargetGroupAttribute struct { // its full share of traffic. The range is 30-900 seconds (15 minutes). The // default is 0 seconds (disabled). // + // * stickiness.app_cookie.duration_seconds - The time period, in seconds, + // during which requests from a client should be routed to the same target. + // After this time period expires, the application-based cookie is considered + // stale. The range is 1 second to 1 week (604800 seconds). The default value + // is 1 day (86400 seconds). + // // * stickiness.lb_cookie.duration_seconds - The time period, in seconds, // during which requests from a client should be routed to the same target. // After this time period expires, the load balancer-generated cookie is diff --git a/service/globalaccelerator/api.go b/service/globalaccelerator/api.go index 0faae6957f7..603dc0b27c9 100644 --- a/service/globalaccelerator/api.go +++ b/service/globalaccelerator/api.go @@ -464,6 +464,10 @@ func (c *GlobalAccelerator) CreateCustomRoutingAcceleratorRequest(input *CreateC // AllowCustomRoutingTraffic (https://docs.aws.amazon.com/global-accelerator/latest/api/API_AllowCustomRoutingTraffic.html) // operation. // +// Global Accelerator is a global service that supports endpoints in multiple +// AWS Regions but you must specify the US West (Oregon) Region to create or +// update accelerators. +// // 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. @@ -5903,7 +5907,7 @@ type CreateAcceleratorInput struct { // Optionally, if you've added your own IP address pool to Global Accelerator // (BYOIP), you can choose IP addresses from your own pool to use for the accelerator's // static IP addresses when you create an accelerator. You can specify one or - // two addresses, separated by a comma. Do not include the /32 suffix. + // two addresses, separated by a space. Do not include the /32 suffix. // // Only one IP address from each of your IP address ranges can be used for each // accelerator. If you specify only one IP address from your IP address range, @@ -6041,6 +6045,23 @@ type CreateCustomRoutingAcceleratorInput struct { // The value for the address type must be IPv4. IpAddressType *string `type:"string" enum:"IpAddressType"` + // Optionally, if you've added your own IP address pool to Global Accelerator + // (BYOIP), you can choose IP addresses from your own pool to use for the accelerator's + // static IP addresses when you create an accelerator. You can specify one or + // two addresses, separated by a space. Do not include the /32 suffix. + // + // Only one IP address from each of your IP address ranges can be used for each + // accelerator. If you specify only one IP address from your IP address range, + // Global Accelerator assigns a second static IP address for the accelerator + // from the AWS IP address pool. + // + // Note that you can't update IP addresses for an existing accelerator. To change + // them, you must create a new accelerator with the new addresses. + // + // For more information, see Bring your own IP addresses (BYOIP) (https://docs.aws.amazon.com/global-accelerator/latest/dg/using-byoip.html) + // in the AWS Global Accelerator Developer Guide. + IpAddresses []*string `type:"list"` + // The name of a custom routing accelerator. The name can have a maximum of // 64 characters, must contain only alphanumeric characters or hyphens (-), // and must not begin or end with a hyphen. @@ -6106,6 +6127,12 @@ func (s *CreateCustomRoutingAcceleratorInput) SetIpAddressType(v string) *Create return s } +// SetIpAddresses sets the IpAddresses field's value. +func (s *CreateCustomRoutingAcceleratorInput) SetIpAddresses(v []*string) *CreateCustomRoutingAcceleratorInput { + s.IpAddresses = v + return s +} + // SetName sets the Name field's value. func (s *CreateCustomRoutingAcceleratorInput) SetName(v string) *CreateCustomRoutingAcceleratorInput { s.Name = &v diff --git a/service/iotsitewise/api.go b/service/iotsitewise/api.go index c730c284655..714eebd2162 100644 --- a/service/iotsitewise/api.go +++ b/service/iotsitewise/api.go @@ -1120,97 +1120,6 @@ func (c *IoTSiteWise) CreatePortalWithContext(ctx aws.Context, input *CreatePort return out, req.Send() } -const opCreatePresignedPortalUrl = "CreatePresignedPortalUrl" - -// CreatePresignedPortalUrlRequest generates a "aws/request.Request" representing the -// client's request for the CreatePresignedPortalUrl 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 CreatePresignedPortalUrl for more information on using the CreatePresignedPortalUrl -// 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 CreatePresignedPortalUrlRequest method. -// req, resp := client.CreatePresignedPortalUrlRequest(params) -// -// err := req.Send() -// if err == nil { // resp is now filled -// fmt.Println(resp) -// } -// -// See also, https://docs.aws.amazon.com/goto/WebAPI/iotsitewise-2019-12-02/CreatePresignedPortalUrl -func (c *IoTSiteWise) CreatePresignedPortalUrlRequest(input *CreatePresignedPortalUrlInput) (req *request.Request, output *CreatePresignedPortalUrlOutput) { - op := &request.Operation{ - Name: opCreatePresignedPortalUrl, - HTTPMethod: "POST", - HTTPPath: "/portals/{portalId}/presigned-url", - } - - if input == nil { - input = &CreatePresignedPortalUrlInput{} - } - - output = &CreatePresignedPortalUrlOutput{} - req = c.newRequest(op, input, output) - req.Handlers.Build.PushBackNamed(protocol.NewHostPrefixHandler("monitor.", nil)) - req.Handlers.Build.PushBackNamed(protocol.ValidateEndpointHostHandler) - return -} - -// CreatePresignedPortalUrl API operation for AWS IoT SiteWise. -// -// 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 SiteWise's -// API operation CreatePresignedPortalUrl for usage and error information. -// -// Returned Error Types: -// * InvalidRequestException -// The request isn't valid. This can occur if your request contains malformed -// JSON or unsupported characters. Check your request and try again. -// -// * InternalFailureException -// AWS IoT SiteWise can't process your request right now. Try again later. -// -// * ThrottlingException -// Your request exceeded a rate limit. For example, you might have exceeded -// the number of AWS IoT SiteWise assets that can be created per second, the -// allowed number of messages per second, and so on. -// -// For more information, see Quotas (https://docs.aws.amazon.com/iot-sitewise/latest/userguide/quotas.html) -// in the AWS IoT SiteWise User Guide. -// -// See also, https://docs.aws.amazon.com/goto/WebAPI/iotsitewise-2019-12-02/CreatePresignedPortalUrl -func (c *IoTSiteWise) CreatePresignedPortalUrl(input *CreatePresignedPortalUrlInput) (*CreatePresignedPortalUrlOutput, error) { - req, out := c.CreatePresignedPortalUrlRequest(input) - return out, req.Send() -} - -// CreatePresignedPortalUrlWithContext is the same as CreatePresignedPortalUrl with the addition of -// the ability to pass a context and additional request options. -// -// See CreatePresignedPortalUrl 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 *IoTSiteWise) CreatePresignedPortalUrlWithContext(ctx aws.Context, input *CreatePresignedPortalUrlInput, opts ...request.Option) (*CreatePresignedPortalUrlOutput, error) { - req, out := c.CreatePresignedPortalUrlRequest(input) - req.SetContext(ctx) - req.ApplyOptions(opts...) - return out, req.Send() -} - const opCreateProject = "CreateProject" // CreateProjectRequest generates a "aws/request.Request" representing the @@ -9833,87 +9742,6 @@ func (s *CreatePortalOutput) SetSsoApplicationId(v string) *CreatePortalOutput { return s } -type CreatePresignedPortalUrlInput struct { - _ struct{} `type:"structure"` - - // PortalId is a required field - PortalId *string `location:"uri" locationName:"portalId" min:"36" type:"string" required:"true"` - - SessionDurationSeconds *int64 `locationName:"sessionDurationSeconds" min:"900" type:"integer"` - - State *string `locationName:"state" type:"string"` -} - -// String returns the string representation -func (s CreatePresignedPortalUrlInput) String() string { - return awsutil.Prettify(s) -} - -// GoString returns the string representation -func (s CreatePresignedPortalUrlInput) GoString() string { - return s.String() -} - -// Validate inspects the fields of the type to determine if they are valid. -func (s *CreatePresignedPortalUrlInput) Validate() error { - invalidParams := request.ErrInvalidParams{Context: "CreatePresignedPortalUrlInput"} - if s.PortalId == nil { - invalidParams.Add(request.NewErrParamRequired("PortalId")) - } - if s.PortalId != nil && len(*s.PortalId) < 36 { - invalidParams.Add(request.NewErrParamMinLen("PortalId", 36)) - } - if s.SessionDurationSeconds != nil && *s.SessionDurationSeconds < 900 { - invalidParams.Add(request.NewErrParamMinValue("SessionDurationSeconds", 900)) - } - - if invalidParams.Len() > 0 { - return invalidParams - } - return nil -} - -// SetPortalId sets the PortalId field's value. -func (s *CreatePresignedPortalUrlInput) SetPortalId(v string) *CreatePresignedPortalUrlInput { - s.PortalId = &v - return s -} - -// SetSessionDurationSeconds sets the SessionDurationSeconds field's value. -func (s *CreatePresignedPortalUrlInput) SetSessionDurationSeconds(v int64) *CreatePresignedPortalUrlInput { - s.SessionDurationSeconds = &v - return s -} - -// SetState sets the State field's value. -func (s *CreatePresignedPortalUrlInput) SetState(v string) *CreatePresignedPortalUrlInput { - s.State = &v - return s -} - -type CreatePresignedPortalUrlOutput struct { - _ struct{} `type:"structure"` - - // PresignedPortalUrl is a required field - PresignedPortalUrl *string `locationName:"presignedPortalUrl" min:"1" type:"string" required:"true"` -} - -// String returns the string representation -func (s CreatePresignedPortalUrlOutput) String() string { - return awsutil.Prettify(s) -} - -// GoString returns the string representation -func (s CreatePresignedPortalUrlOutput) GoString() string { - return s.String() -} - -// SetPresignedPortalUrl sets the PresignedPortalUrl field's value. -func (s *CreatePresignedPortalUrlOutput) SetPresignedPortalUrl(v string) *CreatePresignedPortalUrlOutput { - s.PresignedPortalUrl = &v - return s -} - type CreateProjectInput struct { _ struct{} `type:"structure"` diff --git a/service/iotsitewise/iotsitewiseiface/interface.go b/service/iotsitewise/iotsitewiseiface/interface.go index e567ceff063..d581fa810db 100644 --- a/service/iotsitewise/iotsitewiseiface/interface.go +++ b/service/iotsitewise/iotsitewiseiface/interface.go @@ -100,10 +100,6 @@ type IoTSiteWiseAPI interface { CreatePortalWithContext(aws.Context, *iotsitewise.CreatePortalInput, ...request.Option) (*iotsitewise.CreatePortalOutput, error) CreatePortalRequest(*iotsitewise.CreatePortalInput) (*request.Request, *iotsitewise.CreatePortalOutput) - CreatePresignedPortalUrl(*iotsitewise.CreatePresignedPortalUrlInput) (*iotsitewise.CreatePresignedPortalUrlOutput, error) - CreatePresignedPortalUrlWithContext(aws.Context, *iotsitewise.CreatePresignedPortalUrlInput, ...request.Option) (*iotsitewise.CreatePresignedPortalUrlOutput, error) - CreatePresignedPortalUrlRequest(*iotsitewise.CreatePresignedPortalUrlInput) (*request.Request, *iotsitewise.CreatePresignedPortalUrlOutput) - CreateProject(*iotsitewise.CreateProjectInput) (*iotsitewise.CreateProjectOutput, error) CreateProjectWithContext(aws.Context, *iotsitewise.CreateProjectInput, ...request.Option) (*iotsitewise.CreateProjectOutput, error) CreateProjectRequest(*iotsitewise.CreateProjectInput) (*request.Request, *iotsitewise.CreateProjectOutput) diff --git a/service/ivs/api.go b/service/ivs/api.go index 7588112403f..035decae06e 100644 --- a/service/ivs/api.go +++ b/service/ivs/api.go @@ -1082,6 +1082,8 @@ func (c *IVS) ListChannelsRequest(input *ListChannelsInput) (req *request.Reques // // * AccessDeniedException // +// * ConflictException +// // See also, https://docs.aws.amazon.com/goto/WebAPI/ivs-2020-07-14/ListChannels func (c *IVS) ListChannels(input *ListChannelsInput) (*ListChannelsOutput, error) { req, out := c.ListChannelsRequest(input) @@ -4255,7 +4257,7 @@ type Stream struct { PlaybackUrl *string `locationName:"playbackUrl" type:"string"` // ISO-8601 formatted timestamp of the stream’s start. - StartTime *time.Time `locationName:"startTime" type:"timestamp"` + StartTime *time.Time `locationName:"startTime" type:"timestamp" timestampFormat:"iso8601"` // The stream’s state. State *string `locationName:"state" type:"string" enum:"StreamState"` @@ -4414,7 +4416,7 @@ type StreamSummary struct { Health *string `locationName:"health" type:"string" enum:"StreamHealth"` // ISO-8601 formatted timestamp of the stream’s start. - StartTime *time.Time `locationName:"startTime" type:"timestamp"` + StartTime *time.Time `locationName:"startTime" type:"timestamp" timestampFormat:"iso8601"` // The stream’s state. State *string `locationName:"state" type:"string" enum:"StreamState"` diff --git a/service/macie2/api.go b/service/macie2/api.go index 915ed9095ca..b1fb3c06107 100644 --- a/service/macie2/api.go +++ b/service/macie2/api.go @@ -5989,7 +5989,7 @@ func (s *AccountDetail) SetEmail(v string) *AccountDetail { return s } -// Provides information about account-level permissions settings that apply +// Provides information about the account-level permissions settings that apply // to an S3 bucket. type AccountLevelPermissions struct { _ struct{} `type:"structure"` @@ -6434,7 +6434,7 @@ func (s *BucketCountByEffectivePermission) SetUnknown(v int64) *BucketCountByEff } // Provides information about the number of S3 buckets that use certain types -// of server-side encryption or don't encrypt objects by default. +// of server-side encryption by default or don't encrypt new objects by default. type BucketCountByEncryptionType struct { _ struct{} `type:"structure"` @@ -6683,6 +6683,12 @@ type BucketMetadata struct { // if so, which accounts. ReplicationDetails *ReplicationDetails `locationName:"replicationDetails" type:"structure"` + // Provides information about the default server-side encryption settings for + // an S3 bucket. For detailed information about these settings, see Setting + // default server-side encryption behavior for Amazon S3 buckets (https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucket-encryption.html) + // in the Amazon Simple Storage Service User Guide. + ServerSideEncryption *BucketServerSideEncryption `locationName:"serverSideEncryption" type:"structure"` + SharedAccess *string `locationName:"sharedAccess" type:"string" enum:"SharedAccess"` SizeInBytes *int64 `locationName:"sizeInBytes" type:"long"` @@ -6794,6 +6800,12 @@ func (s *BucketMetadata) SetReplicationDetails(v *ReplicationDetails) *BucketMet return s } +// SetServerSideEncryption sets the ServerSideEncryption field's value. +func (s *BucketMetadata) SetServerSideEncryption(v *BucketServerSideEncryption) *BucketMetadata { + s.ServerSideEncryption = v + return s +} + // SetSharedAccess sets the SharedAccess field's value. func (s *BucketMetadata) SetSharedAccess(v string) *BucketMetadata { s.SharedAccess = &v @@ -6841,7 +6853,7 @@ func (s *BucketMetadata) SetVersioning(v bool) *BucketMetadata { type BucketPermissionConfiguration struct { _ struct{} `type:"structure"` - // Provides information about account-level permissions settings that apply + // Provides information about the account-level permissions settings that apply // to an S3 bucket. AccountLevelPermissions *AccountLevelPermissions `locationName:"accountLevelPermissions" type:"structure"` @@ -6938,6 +6950,40 @@ func (s *BucketPublicAccess) SetPermissionConfiguration(v *BucketPermissionConfi return s } +// Provides information about the default server-side encryption settings for +// an S3 bucket. For detailed information about these settings, see Setting +// default server-side encryption behavior for Amazon S3 buckets (https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucket-encryption.html) +// in the Amazon Simple Storage Service User Guide. +type BucketServerSideEncryption struct { + _ struct{} `type:"structure"` + + KmsMasterKeyId *string `locationName:"kmsMasterKeyId" type:"string"` + + Type *string `locationName:"type" type:"string" enum:"Type"` +} + +// String returns the string representation +func (s BucketServerSideEncryption) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s BucketServerSideEncryption) GoString() string { + return s.String() +} + +// SetKmsMasterKeyId sets the KmsMasterKeyId field's value. +func (s *BucketServerSideEncryption) SetKmsMasterKeyId(v string) *BucketServerSideEncryption { + s.KmsMasterKeyId = &v + return s +} + +// SetType sets the Type field's value. +func (s *BucketServerSideEncryption) SetType(v string) *BucketServerSideEncryption { + s.Type = &v + return s +} + // Specifies criteria for sorting the results of a query for information about // S3 buckets. type BucketSortCriteria struct { @@ -9553,7 +9599,7 @@ type GetBucketStatisticsOutput struct { BucketCountByEffectivePermission *BucketCountByEffectivePermission `locationName:"bucketCountByEffectivePermission" type:"structure"` // Provides information about the number of S3 buckets that use certain types - // of server-side encryption or don't encrypt objects by default. + // of server-side encryption by default or don't encrypt new objects by default. BucketCountByEncryptionType *BucketCountByEncryptionType `locationName:"bucketCountByEncryptionType" type:"structure"` // Provides information about the number of S3 buckets that are shared with @@ -10419,7 +10465,8 @@ func (s *GetMemberOutput) SetUpdatedAt(v time.Time) *GetMemberOutput { } // Specifies criteria for filtering, sorting, and paginating the results of -// a query for quotas and aggregated usage data for one or more accounts. +// a query for quotas and aggregated usage data for one or more Amazon Macie +// accounts. type GetUsageStatisticsInput struct { _ struct{} `type:"structure"` @@ -10429,9 +10476,13 @@ type GetUsageStatisticsInput struct { NextToken *string `locationName:"nextToken" type:"string"` - // Specifies criteria for sorting the results of a query for account quotas - // and usage data. + // Specifies criteria for sorting the results of a query for Amazon Macie account + // quotas and usage data. SortBy *UsageStatisticsSortBy `locationName:"sortBy" type:"structure"` + + // An inclusive time period that Amazon Macie usage data applies to. Possible + // values are: + TimeRange *string `locationName:"timeRange" type:"string" enum:"TimeRange"` } // String returns the string representation @@ -10468,14 +10519,24 @@ func (s *GetUsageStatisticsInput) SetSortBy(v *UsageStatisticsSortBy) *GetUsageS return s } +// SetTimeRange sets the TimeRange field's value. +func (s *GetUsageStatisticsInput) SetTimeRange(v string) *GetUsageStatisticsInput { + s.TimeRange = &v + return s +} + // Provides the results of a query that retrieved quotas and aggregated usage -// data for one or more accounts. +// data for one or more Amazon Macie accounts. type GetUsageStatisticsOutput struct { _ struct{} `type:"structure"` NextToken *string `locationName:"nextToken" type:"string"` Records []*UsageRecord `locationName:"records" type:"list"` + + // An inclusive time period that Amazon Macie usage data applies to. Possible + // values are: + TimeRange *string `locationName:"timeRange" type:"string" enum:"TimeRange"` } // String returns the string representation @@ -10500,8 +10561,16 @@ func (s *GetUsageStatisticsOutput) SetRecords(v []*UsageRecord) *GetUsageStatist return s } +// SetTimeRange sets the TimeRange field's value. +func (s *GetUsageStatisticsOutput) SetTimeRange(v string) *GetUsageStatisticsOutput { + s.TimeRange = &v + return s +} + type GetUsageTotalsInput struct { _ struct{} `type:"structure"` + + TimeRange *string `location:"querystring" locationName:"timeRange" type:"string"` } // String returns the string representation @@ -10514,11 +10583,21 @@ func (s GetUsageTotalsInput) GoString() string { return s.String() } +// SetTimeRange sets the TimeRange field's value. +func (s *GetUsageTotalsInput) SetTimeRange(v string) *GetUsageTotalsInput { + s.TimeRange = &v + return s +} + // Provides the results of a query that retrieved aggregated usage data for -// an account during the past 30 days. +// an Amazon Macie account. type GetUsageTotalsOutput struct { _ struct{} `type:"structure"` + // An inclusive time period that Amazon Macie usage data applies to. Possible + // values are: + TimeRange *string `locationName:"timeRange" type:"string" enum:"TimeRange"` + UsageTotals []*UsageTotal `locationName:"usageTotals" type:"list"` } @@ -10532,6 +10611,12 @@ func (s GetUsageTotalsOutput) GoString() string { return s.String() } +// SetTimeRange sets the TimeRange field's value. +func (s *GetUsageTotalsOutput) SetTimeRange(v string) *GetUsageTotalsOutput { + s.TimeRange = &v + return s +} + // SetUsageTotals sets the UsageTotals field's value. func (s *GetUsageTotalsOutput) SetUsageTotals(v []*UsageTotal) *GetUsageTotalsOutput { s.UsageTotals = v @@ -13076,7 +13161,7 @@ func (s *ServerSideEncryption) SetKmsMasterKeyId(v string) *ServerSideEncryption return s } -// Specifies a current quota for an account. +// Specifies a current quota for an Amazon Macie account. type ServiceLimit struct { _ struct{} `type:"structure"` @@ -14206,21 +14291,21 @@ func (s UpdateOrganizationConfigurationOutput) GoString() string { } // Provides data for a specific usage metric and the corresponding quota for -// an account. The value for the metric is an aggregated value that reports -// usage during the past 30 days. +// an Amazon Macie account. type UsageByAccount struct { _ struct{} `type:"structure"` - // The type of currency that data for a usage metric is reported in. Possible - // values are: + // The type of currency that the data for an Amazon Macie usage metric is reported + // in. Possible values are: Currency *string `locationName:"currency" type:"string" enum:"Currency"` EstimatedCost *string `locationName:"estimatedCost" type:"string"` - // Specifies a current quota for an account. + // Specifies a current quota for an Amazon Macie account. ServiceLimit *ServiceLimit `locationName:"serviceLimit" type:"structure"` - // The name of a usage metric for an account. Possible values are: + // The name of an Amazon Macie usage metric for an account. Possible values + // are: Type *string `locationName:"type" type:"string" enum:"UsageType"` } @@ -14258,7 +14343,7 @@ func (s *UsageByAccount) SetType(v string) *UsageByAccount { return s } -// Provides quota and aggregated usage data for an account. +// Provides quota and aggregated usage data for an Amazon Macie account. type UsageRecord struct { _ struct{} `type:"structure"` @@ -14297,17 +14382,17 @@ func (s *UsageRecord) SetUsage(v []*UsageByAccount) *UsageRecord { return s } -// Specifies a condition for filtering the results of a query for account quotas -// and usage data. +// Specifies a condition for filtering the results of a query for the quotas +// and usage data that applies to one or more Amazon Macie accounts. type UsageStatisticsFilter struct { _ struct{} `type:"structure"` // The operator to use in a condition that filters the results of a query for - // account quotas and usage data. Valid values are: + // Amazon Macie account quotas and usage data. Valid values are: Comparator *string `locationName:"comparator" type:"string" enum:"UsageStatisticsFilterComparator"` - // The field to use in a condition that filters the results of a query for account - // quotas and usage data. Valid values are: + // The field to use in a condition that filters the results of a query for Amazon + // Macie account quotas and usage data. Valid values are: Key *string `locationName:"key" type:"string" enum:"UsageStatisticsFilterKey"` Values []*string `locationName:"values" type:"list"` @@ -14341,13 +14426,13 @@ func (s *UsageStatisticsFilter) SetValues(v []*string) *UsageStatisticsFilter { return s } -// Specifies criteria for sorting the results of a query for account quotas -// and usage data. +// Specifies criteria for sorting the results of a query for Amazon Macie account +// quotas and usage data. type UsageStatisticsSortBy struct { _ struct{} `type:"structure"` - // The field to use to sort the results of a query for account quotas and usage - // data. Valid values are: + // The field to use to sort the results of a query for Amazon Macie account + // quotas and usage data. Valid values are: Key *string `locationName:"key" type:"string" enum:"UsageStatisticsSortKey"` OrderBy *string `locationName:"orderBy" type:"string" enum:"OrderBy"` @@ -14375,18 +14460,21 @@ func (s *UsageStatisticsSortBy) SetOrderBy(v string) *UsageStatisticsSortBy { return s } -// Provides aggregated data for a usage metric. The value for the metric reports -// usage data for an account during the past 30 days. +// Provides aggregated data for an Amazon Macie usage metric. The value for +// the metric reports estimated usage data for an account for the preceding +// 30 days or the current calendar month to date, depending on the time period +// (timeRange) specified in the request. type UsageTotal struct { _ struct{} `type:"structure"` - // The type of currency that data for a usage metric is reported in. Possible - // values are: + // The type of currency that the data for an Amazon Macie usage metric is reported + // in. Possible values are: Currency *string `locationName:"currency" type:"string" enum:"Currency"` EstimatedCost *string `locationName:"estimatedCost" type:"string"` - // The name of a usage metric for an account. Possible values are: + // The name of an Amazon Macie usage metric for an account. Possible values + // are: Type *string `locationName:"type" type:"string" enum:"UsageType"` } @@ -14694,8 +14782,8 @@ func AdminStatus_Values() []string { } } -// The type of currency that data for a usage metric is reported in. Possible -// values are: +// The type of currency that the data for an Amazon Macie usage metric is reported +// in. Possible values are: const ( // CurrencyUsd is a Currency enum value CurrencyUsd = "USD" @@ -15412,6 +15500,44 @@ func TagTarget_Values() []string { } } +// An inclusive time period that Amazon Macie usage data applies to. Possible +// values are: +const ( + // TimeRangeMonthToDate is a TimeRange enum value + TimeRangeMonthToDate = "MONTH_TO_DATE" + + // TimeRangePast30Days is a TimeRange enum value + TimeRangePast30Days = "PAST_30_DAYS" +) + +// TimeRange_Values returns all elements of the TimeRange enum +func TimeRange_Values() []string { + return []string{ + TimeRangeMonthToDate, + TimeRangePast30Days, + } +} + +const ( + // TypeNone is a Type enum value + TypeNone = "NONE" + + // TypeAes256 is a Type enum value + TypeAes256 = "AES256" + + // TypeAwsKms is a Type enum value + TypeAwsKms = "aws:kms" +) + +// Type_Values returns all elements of the Type enum +func Type_Values() []string { + return []string{ + TypeNone, + TypeAes256, + TypeAwsKms, + } +} + const ( // UnitTerabytes is a Unit enum value UnitTerabytes = "TERABYTES" @@ -15425,7 +15551,7 @@ func Unit_Values() []string { } // The operator to use in a condition that filters the results of a query for -// account quotas and usage data. Valid values are: +// Amazon Macie account quotas and usage data. Valid values are: const ( // UsageStatisticsFilterComparatorGt is a UsageStatisticsFilterComparator enum value UsageStatisticsFilterComparatorGt = "GT" @@ -15462,8 +15588,8 @@ func UsageStatisticsFilterComparator_Values() []string { } } -// The field to use in a condition that filters the results of a query for account -// quotas and usage data. Valid values are: +// The field to use in a condition that filters the results of a query for Amazon +// Macie account quotas and usage data. Valid values are: const ( // UsageStatisticsFilterKeyAccountId is a UsageStatisticsFilterKey enum value UsageStatisticsFilterKeyAccountId = "accountId" @@ -15488,8 +15614,8 @@ func UsageStatisticsFilterKey_Values() []string { } } -// The field to use to sort the results of a query for account quotas and usage -// data. Valid values are: +// The field to use to sort the results of a query for Amazon Macie account +// quotas and usage data. Valid values are: const ( // UsageStatisticsSortKeyAccountId is a UsageStatisticsSortKey enum value UsageStatisticsSortKeyAccountId = "accountId" @@ -15514,7 +15640,8 @@ func UsageStatisticsSortKey_Values() []string { } } -// The name of a usage metric for an account. Possible values are: +// The name of an Amazon Macie usage metric for an account. Possible values +// are: const ( // UsageTypeDataInventoryEvaluation is a UsageType enum value UsageTypeDataInventoryEvaluation = "DATA_INVENTORY_EVALUATION"