The string identifier of the associated RestApi.
", "StageKey$stageName": "The stage name associated with the stage key.
", "TagResourceRequest$resourceArn": "[Required] The ARN of a resource that can be tagged.
", - "Template$value": "The Apache Velocity Template Language (VTL) template content used for the template resource.
", + "Template$value": "The Apache Velocity Template Language (VTL) template content used for the template resource.
", "TestInvokeAuthorizerRequest$restApiId": "[Required] The string identifier of the associated RestApi.
", "TestInvokeAuthorizerRequest$authorizerId": "[Required] Specifies a test invoke authorizer request's Authorizer ID.
", "TestInvokeAuthorizerRequest$pathWithQueryString": "[Optional] The URI path, including query string, of the simulated invocation request. Use this to specify path parameters and query string parameters.
", diff --git a/models/apis/ec2/2016-11-15/docs-2.json b/models/apis/ec2/2016-11-15/docs-2.json index 6e8463d11e..9ce1130a4a 100755 --- a/models/apis/ec2/2016-11-15/docs-2.json +++ b/models/apis/ec2/2016-11-15/docs-2.json @@ -271,11 +271,11 @@ "DisableTransitGatewayRouteTablePropagation": "Disables the specified resource attachment from propagating routes to the specified propagation route table.
", "DisableVgwRoutePropagation": "Disables a virtual private gateway (VGW) from propagating routes to a specified route table of a VPC.
", "DisableVpcClassicLink": "Disables ClassicLink for a VPC. You cannot disable ClassicLink for a VPC that has EC2-Classic instances linked to it.
", - "DisableVpcClassicLinkDnsSupport": "Disables ClassicLink DNS support for a VPC. If disabled, DNS hostnames resolve to public IP addresses when addressed between a linked EC2-Classic instance and instances in the VPC to which it's linked. For more information, see ClassicLink in the Amazon Elastic Compute Cloud User Guide.
", + "DisableVpcClassicLinkDnsSupport": "Disables ClassicLink DNS support for a VPC. If disabled, DNS hostnames resolve to public IP addresses when addressed between a linked EC2-Classic instance and instances in the VPC to which it's linked. For more information, see ClassicLink in the Amazon Elastic Compute Cloud User Guide.
You must specify a VPC ID in the request.
", "DisassociateAddress": "Disassociates an Elastic IP address from the instance or network interface it's associated with.
An Elastic IP address is for use in either the EC2-Classic platform or in a VPC. For more information, see Elastic IP Addresses in the Amazon Elastic Compute Cloud User Guide.
This is an idempotent operation. If you perform the operation more than once, Amazon EC2 doesn't return an error.
", "DisassociateClientVpnTargetNetwork": "Disassociates a target network from the specified Client VPN endpoint. When you disassociate the last target network from a Client VPN, the following happens:
The route that was automatically added for the VPC is deleted
All active client connections are terminated
New client connections are disallowed
The Client VPN endpoint's status changes to pending-associate
Disassociates an IAM instance profile from a running or stopped instance.
Use DescribeIamInstanceProfileAssociations to get the association ID.
", - "DisassociateRouteTable": "Disassociates a subnet from a route table.
After you perform this action, the subnet no longer uses the routes in the route table. Instead, it uses the routes in the VPC's main route table. For more information about route tables, see Route Tables in the Amazon Virtual Private Cloud User Guide.
", + "DisassociateRouteTable": "Disassociates a subnet or gateway from a route table.
After you perform this action, the subnet no longer uses the routes in the route table. Instead, it uses the routes in the VPC's main route table. For more information about route tables, see Route Tables in the Amazon Virtual Private Cloud User Guide.
", "DisassociateSubnetCidrBlock": "Disassociates a CIDR block from a subnet. Currently, you can disassociate an IPv6 CIDR block only. You must detach or delete all gateways and resources that are associated with the CIDR block before you can disassociate it.
", "DisassociateTransitGatewayMulticastDomain": "Disassociates the specified subnets from the transit gateway multicast domain.
", "DisassociateTransitGatewayRouteTable": "Disassociates a resource attachment from a transit gateway route table.
", @@ -286,7 +286,7 @@ "EnableVgwRoutePropagation": "Enables a virtual private gateway (VGW) to propagate routes to the specified route table of a VPC.
", "EnableVolumeIO": "Enables I/O operations for a volume that had I/O operations disabled because the data on the volume was potentially inconsistent.
", "EnableVpcClassicLink": "Enables a VPC for ClassicLink. You can then link EC2-Classic instances to your ClassicLink-enabled VPC to allow communication over private IP addresses. You cannot enable your VPC for ClassicLink if any of your VPC route tables have existing routes for address ranges within the 10.0.0.0/8 IP address range, excluding local routes for VPCs in the 10.0.0.0/16 and 10.1.0.0/16 IP address ranges. For more information, see ClassicLink in the Amazon Elastic Compute Cloud User Guide.
Enables a VPC to support DNS hostname resolution for ClassicLink. If enabled, the DNS hostname of a linked EC2-Classic instance resolves to its private IP address when addressed from an instance in the VPC to which it's linked. Similarly, the DNS hostname of an instance in a VPC resolves to its private IP address when addressed from a linked EC2-Classic instance. For more information, see ClassicLink in the Amazon Elastic Compute Cloud User Guide.
", + "EnableVpcClassicLinkDnsSupport": "Enables a VPC to support DNS hostname resolution for ClassicLink. If enabled, the DNS hostname of a linked EC2-Classic instance resolves to its private IP address when addressed from an instance in the VPC to which it's linked. Similarly, the DNS hostname of an instance in a VPC resolves to its private IP address when addressed from a linked EC2-Classic instance. For more information, see ClassicLink in the Amazon Elastic Compute Cloud User Guide.
You must specify a VPC ID in the request.
", "ExportClientVpnClientCertificateRevocationList": "Downloads the client certificate revocation list for the specified Client VPN endpoint.
", "ExportClientVpnClientConfiguration": "Downloads the contents of the Client VPN endpoint configuration file for the specified Client VPN endpoint. The Client VPN endpoint configuration file includes the Client VPN endpoint and certificate information clients need to establish a connection with the Client VPN endpoint.
", "ExportImage": "Exports an Amazon Machine Image (AMI) to a VM file. For more information, see Exporting a VM Directory from an Amazon Machine Image (AMI) in the VM Import/Export User Guide.
", @@ -11108,7 +11108,7 @@ "RouteTableAssociationId": { "base": null, "refs": { - "DisassociateRouteTableRequest$AssociationId": "The association ID representing the current association between the route table and subnet.
", + "DisassociateRouteTableRequest$AssociationId": "The association ID representing the current association between the route table and subnet or gateway.
", "ReplaceRouteTableAssociationRequest$AssociationId": "The association ID.
" } }, @@ -12089,7 +12089,7 @@ "CreateFlowLogsRequest$DeliverLogsPermissionArn": "The ARN for the IAM role that permits Amazon EC2 to publish flow logs to a CloudWatch Logs log group in your account.
If you specify LogDestinationType as s3, do not specify DeliverLogsPermissionArn or LogGroupName.
The name of a new or existing CloudWatch Logs log group where Amazon EC2 publishes your flow logs.
If you specify LogDestinationType as s3, do not specify DeliverLogsPermissionArn or LogGroupName.
Specifies the destination to which the flow log data is to be published. Flow log data can be published to a CloudWatch Logs log group or an Amazon S3 bucket. The value specified for this parameter depends on the value specified for LogDestinationType.
If LogDestinationType is not specified or cloud-watch-logs, specify the Amazon Resource Name (ARN) of the CloudWatch Logs log group. For example, to publish to a log group called my-logs, specify arn:aws:logs:us-east-1:123456789012:log-group:my-logs. Alternatively, use LogGroupName instead.
If LogDestinationType is s3, specify the ARN of the Amazon S3 bucket. You can also specify a subfolder in the bucket. To specify a subfolder in the bucket, use the following ARN format: bucket_ARN/subfolder_name/. For example, to specify a subfolder named my-logs in a bucket named my-bucket, use the following ARN: arn:aws:s3:::my-bucket/my-logs/. You cannot use AWSLogs as a subfolder name. This is a reserved term.
The fields to include in the flow log record, in the order in which they should appear. For a list of available fields, see Flow Log Records. If you omit this parameter, the flow log is created using the default format. If you specify this parameter, you must specify at least one field.
Specify the fields using the ${field-id} format, separated by spaces. For the AWS CLI, use single quotation marks (' ') to surround the parameter value.
Only applicable to flow logs that are published to an Amazon S3 bucket.
", + "CreateFlowLogsRequest$LogFormat": "The fields to include in the flow log record, in the order in which they should appear. For a list of available fields, see Flow Log Records. If you omit this parameter, the flow log is created using the default format. If you specify this parameter, you must specify at least one field.
Specify the fields using the ${field-id} format, separated by spaces. For the AWS CLI, use single quotation marks (' ') to surround the parameter value.
Unique, case-sensitive identifier that you provide to ensure the idempotency of the request.
", "CreateFpgaImageRequest$Description": "A description for the AFI.
", "CreateFpgaImageRequest$Name": "A name for the AFI.
", diff --git a/models/apis/s3control/2018-08-20/api-2.json b/models/apis/s3control/2018-08-20/api-2.json index d83e1bd7e7..45569a5d0f 100755 --- a/models/apis/s3control/2018-08-20/api-2.json +++ b/models/apis/s3control/2018-08-20/api-2.json @@ -271,7 +271,8 @@ }, "AccountId":{ "type":"string", - "max":64 + "max":64, + "pattern":"^\\d{12}$" }, "BadRequestException":{ "type":"structure", @@ -457,6 +458,12 @@ "max":1024, "min":1 }, + "FunctionArnString":{ + "type":"string", + "max":1024, + "min":1, + "pattern":"(arn:(aws[a-zA-Z-]*)?:lambda:)?([a-z]{2}((-gov)|(-iso(b?)))?-[a-z]+-\\d{1}:)?(\\d{12}:)?(function:)?([a-zA-Z0-9-_]+)(:(\\$LATEST|[a-zA-Z0-9-_]+))?" + }, "GetAccessPointPolicyRequest":{ "type":"structure", "required":[ @@ -583,7 +590,8 @@ "IAMRoleArn":{ "type":"string", "max":2048, - "min":1 + "min":1, + "pattern":"arn:[^:]+:iam::\\d{12}:role/.*" }, "IdempotencyException":{ "type":"structure", @@ -618,7 +626,8 @@ "JobArn":{ "type":"string", "max":1024, - "min":1 + "min":1, + "pattern":"arn:[^:]+:s3:[a-zA-Z0-9\\-]+:\\d{12}:job\\/.*" }, "JobCreationTime":{"type":"timestamp"}, "JobDescriptor":{ @@ -706,7 +715,8 @@ "JobId":{ "type":"string", "max":36, - "min":5 + "min":5, + "pattern":"[a-zA-Z0-9\\-\\_]+" }, "JobListDescriptor":{ "type":"structure", @@ -812,6 +822,14 @@ "S3InitiateRestoreObject":{ "shape":"S3InitiateRestoreObjectOperation", "box":true + }, + "S3PutObjectLegalHold":{ + "shape":"S3SetObjectLegalHoldOperation", + "box":true + }, + "S3PutObjectRetention":{ + "shape":"S3SetObjectRetentionOperation", + "box":true } } }, @@ -918,7 +936,7 @@ "LambdaInvokeOperation":{ "type":"structure", "members":{ - "FunctionArn":{"shape":"NonEmptyMaxLength1024String"} + "FunctionArn":{"shape":"FunctionArnString"} } }, "ListAccessPointsRequest":{ @@ -969,7 +987,7 @@ "locationName":"jobStatuses" }, "NextToken":{ - "shape":"NonEmptyMaxLength1024String", + "shape":"StringForNextToken", "location":"querystring", "locationName":"nextToken" }, @@ -984,7 +1002,7 @@ "ListJobsResult":{ "type":"structure", "members":{ - "NextToken":{"shape":"NonEmptyMaxLength1024String"}, + "NextToken":{"shape":"StringForNextToken"}, "Jobs":{"shape":"JobListDescriptorList"} } }, @@ -1047,7 +1065,9 @@ "S3PutObjectCopy", "S3PutObjectAcl", "S3PutObjectTagging", - "S3InitiateRestoreObject" + "S3InitiateRestoreObject", + "S3PutObjectLegalHold", + "S3PutObjectRetention" ] }, "Policy":{"type":"string"}, @@ -1184,7 +1204,8 @@ "S3BucketArnString":{ "type":"string", "max":128, - "min":1 + "min":1, + "pattern":"arn:[^:]+:s3:.*" }, "S3CannedAccessControlList":{ "type":"string", @@ -1280,7 +1301,8 @@ "S3KeyArnString":{ "type":"string", "max":2000, - "min":1 + "min":1, + "pattern":"arn:[^:]+:s3:.*" }, "S3MetadataDirective":{ "type":"string", @@ -1289,6 +1311,13 @@ "REPLACE" ] }, + "S3ObjectLockLegalHold":{ + "type":"structure", + "required":["Status"], + "members":{ + "Status":{"shape":"S3ObjectLockLegalHoldStatus"} + } + }, "S3ObjectLockLegalHoldStatus":{ "type":"string", "enum":[ @@ -1303,6 +1332,13 @@ "GOVERNANCE" ] }, + "S3ObjectLockRetentionMode":{ + "type":"string", + "enum":[ + "COMPLIANCE", + "GOVERNANCE" + ] + }, "S3ObjectMetadata":{ "type":"structure", "members":{ @@ -1344,6 +1380,13 @@ "WRITE_ACP" ] }, + "S3Retention":{ + "type":"structure", + "members":{ + "RetainUntilDate":{"shape":"TimeStamp"}, + "Mode":{"shape":"S3ObjectLockRetentionMode"} + } + }, "S3SSEAlgorithm":{ "type":"string", "enum":[ @@ -1357,6 +1400,24 @@ "AccessControlPolicy":{"shape":"S3AccessControlPolicy"} } }, + "S3SetObjectLegalHoldOperation":{ + "type":"structure", + "required":["LegalHold"], + "members":{ + "LegalHold":{"shape":"S3ObjectLockLegalHold"} + } + }, + "S3SetObjectRetentionOperation":{ + "type":"structure", + "required":["Retention"], + "members":{ + "BypassGovernanceRetention":{ + "shape":"Boolean", + "box":true + }, + "Retention":{"shape":"S3Retention"} + } + }, "S3SetObjectTaggingOperation":{ "type":"structure", "members":{ @@ -1381,8 +1442,8 @@ "Value" ], "members":{ - "Key":{"shape":"NonEmptyMaxLength1024String"}, - "Value":{"shape":"MaxLength1024String"} + "Key":{"shape":"TagKeyString"}, + "Value":{"shape":"TagValueString"} } }, "S3TagSet":{ @@ -1396,12 +1457,29 @@ "max":8192 }, "Setting":{"type":"boolean"}, + "StringForNextToken":{ + "type":"string", + "max":1024, + "min":1, + "pattern":"^[A-Za-z0-9\\+\\:\\/\\=\\?\\#-_]+$" + }, "SuspendedCause":{ "type":"string", "max":1024, "min":1 }, "SuspendedDate":{"type":"timestamp"}, + "TagKeyString":{ + "type":"string", + "max":1024, + "min":1, + "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:=+\\-@%]*)$" + }, + "TagValueString":{ + "type":"string", + "max":1024, + "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:=+\\-@%]*)$" + }, "TimeStamp":{"type":"timestamp"}, "TooManyRequestsException":{ "type":"structure", diff --git a/models/apis/s3control/2018-08-20/docs-2.json b/models/apis/s3control/2018-08-20/docs-2.json index f536e8c379..13c1e6af89 100755 --- a/models/apis/s3control/2018-08-20/docs-2.json +++ b/models/apis/s3control/2018-08-20/docs-2.json @@ -3,24 +3,24 @@ "service": "AWS S3 Control provides access to Amazon S3 control plane operations.
", "operations": { "CreateAccessPoint": "Creates an access point and associates it with the specified bucket.
", - "CreateJob": "Creates an Amazon S3 batch operations job.
", + "CreateJob": "You can use Amazon S3 Batch Operations to perform large-scale Batch Operations on Amazon S3 objects. Amazon S3 Batch Operations can execute a single operation or action on lists of Amazon S3 objects that you specify. For more information, see Amazon S3 Batch Operations in the Amazon Simple Storage Service Developer Guide.
Related actions include:
", "DeleteAccessPoint": "Deletes the specified access point.
", "DeleteAccessPointPolicy": "Deletes the access point policy for the specified access point.
", - "DeleteJobTagging": "Delete the tags on a Amazon S3 batch operations job, if any.
", + "DeleteJobTagging": "Removes the entire tag set from the specified Amazon S3 Batch Operations job. To use this operation, you must have permission to perform the s3:DeleteJobTagging action. For more information, see Using Job Tags in the Amazon Simple Storage Service Developer Guide.
Related actions include:
", "DeletePublicAccessBlock": "Removes the PublicAccessBlock configuration for an Amazon Web Services account.
Retrieves the configuration parameters and status for a batch operations job.
", + "DescribeJob": "Retrieves the configuration parameters and status for a Batch Operations job. For more information, see Amazon S3 Batch Operations in the Amazon Simple Storage Service Developer Guide.
Related actions include:
", "GetAccessPoint": "Returns configuration information about the specified access point.
", "GetAccessPointPolicy": "Returns the access point policy associated with the specified access point.
", "GetAccessPointPolicyStatus": "Indicates whether the specified access point currently has a policy that allows public access. For more information about public access through access points, see Managing Data Access with Amazon S3 Access Points in the Amazon Simple Storage Service Developer Guide.
", - "GetJobTagging": "Retrieve the tags on a Amazon S3 batch operations job.
", + "GetJobTagging": "Returns the tags on an Amazon S3 Batch Operations job. To use this operation, you must have permission to perform the s3:GetJobTagging action. For more information, see Using Job Tags in the Amazon Simple Storage Service Developer Guide.
Related actions include:
", "GetPublicAccessBlock": "Retrieves the PublicAccessBlock configuration for an Amazon Web Services account.
Returns a list of the access points currently associated with the specified bucket. You can retrieve up to 1000 access points per call. If the specified bucket has more than 1000 access points (or the number specified in maxResults, whichever is less), then the response will include a continuation token that you can use to list the additional access points.
Lists current jobs and jobs that have ended within the last 30 days for the AWS account making the request.
", + "ListAccessPoints": "Returns a list of the access points currently associated with the specified bucket. You can retrieve up to 1000 access points per call. If the specified bucket has more than 1,000 access points (or the number specified in maxResults, whichever is less), the response will include a continuation token that you can use to list the additional access points.
Lists current Amazon S3 Batch Operations jobs and jobs that have ended within the last 30 days for the AWS account making the request. For more information, see Amazon S3 Batch Operations in the Amazon Simple Storage Service Developer Guide.
Related actions include:
", "PutAccessPointPolicy": "Associates an access policy with the specified access point. Each access point can have only one policy, so a request made to this API replaces any existing policy associated with the specified access point.
", - "PutJobTagging": "Replace the set of tags on a Amazon S3 batch operations job.
", + "PutJobTagging": "Set the supplied tag-set on an Amazon S3 Batch Operations job.
A tag is a key-value pair. You can associate Amazon S3 Batch Operations tags with any job by sending a PUT request against the tagging subresource that is associated with the job. To modify the existing tag set, you can either replace the existing tag set entirely, or make changes within the existing tag set by retrieving the existing tag set using GetJobTagging, modify that tag set, and use this API action to replace the tag set with the one you have modified.. For more information, see Using Job Tags in the Amazon Simple Storage Service Developer Guide.
If you send this request with an empty tag set, Amazon S3 deletes the existing tag set on the Batch Operations job. If you use this method, you will be charged for a Tier 1 Request (PUT). For more information, see Amazon S3 pricing.
For deleting existing tags for your batch operations job, DeleteJobTagging request is preferred because it achieves the same result without incurring charges.
A few things to consider about using tags:
Amazon S3 limits the maximum number of tags to 50 tags per job.
You can associate up to 50 tags with a job as long as they have unique tag keys.
A tag key can be up to 128 Unicode characters in length, and tag values can be up to 256 Unicode characters in length.
The key and values are case sensitive.
For tagging-related restrictions related to characters and encodings, see User-Defined Tag Restrictions.
To use this operation, you must have permission to perform the s3:PutJobTagging action.
Related actions include:
", "PutPublicAccessBlock": "Creates or modifies the PublicAccessBlock configuration for an Amazon Web Services account.
Updates an existing job's priority.
", - "UpdateJobStatus": "Updates the status for the specified job. Use this operation to confirm that you want to run a job or to cancel an existing job.
" + "UpdateJobPriority": "Updates an existing Amazon S3 Batch Operations job's priority. For more information, see Amazon S3 Batch Operations in the Amazon Simple Storage Service Developer Guide.
Related actions include:
", + "UpdateJobStatus": "Updates the status for the specified job. Use this operation to confirm that you want to run a job or to cancel an existing job. For more information, see Amazon S3 Batch Operations in the Amazon Simple Storage Service Developer Guide.
Related actions include:
" }, "shapes": { "AccessPoint": { @@ -56,18 +56,18 @@ "CreateJobRequest$AccountId": "", "DeleteAccessPointPolicyRequest$AccountId": "The account ID for the account that owns the specified access point.
", "DeleteAccessPointRequest$AccountId": "The account ID for the account that owns the specified access point.
", - "DeleteJobTaggingRequest$AccountId": "The account ID for the Amazon Web Services account associated with the Amazon S3 batch operations job you want to remove tags from.
", + "DeleteJobTaggingRequest$AccountId": "The AWS account ID associated with the Amazon S3 Batch Operations job.
", "DeletePublicAccessBlockRequest$AccountId": "The account ID for the Amazon Web Services account whose PublicAccessBlock configuration you want to remove.
The account ID for the account that owns the specified access point.
", "GetAccessPointPolicyStatusRequest$AccountId": "The account ID for the account that owns the specified access point.
", "GetAccessPointRequest$AccountId": "The account ID for the account that owns the specified access point.
", - "GetJobTaggingRequest$AccountId": "The account ID for the Amazon Web Services account associated with the Amazon S3 batch operations job you want to retrieve tags for.
", + "GetJobTaggingRequest$AccountId": "The AWS account ID associated with the Amazon S3 Batch Operations job.
", "GetPublicAccessBlockRequest$AccountId": "The account ID for the Amazon Web Services account whose PublicAccessBlock configuration you want to retrieve.
The AWS account ID for owner of the bucket whose access points you want to list.
", "ListJobsRequest$AccountId": "", "PutAccessPointPolicyRequest$AccountId": "The AWS account ID for owner of the bucket associated with the specified access point.
", - "PutJobTaggingRequest$AccountId": "The account ID for the Amazon Web Services account associated with the Amazon S3 batch operations job you want to replace tags on.
", + "PutJobTaggingRequest$AccountId": "The AWS account ID associated with the Amazon S3 Batch Operations job.
", "PutPublicAccessBlockRequest$AccountId": "The account ID for the Amazon Web Services account whose PublicAccessBlock configuration you want to set.
Indicates whether the specified job will generate a job-completion report.
", "S3CopyObjectOperation$RequesterPays": "", - "S3ObjectMetadata$RequesterCharged": "" + "S3ObjectMetadata$RequesterCharged": "", + "S3SetObjectRetentionOperation$BypassGovernanceRetention": "Indicates if the operation should be applied to objects in the Batch Operations job even if they have Governance-type Object Lock in place.
" } }, "BucketName": { @@ -172,6 +173,12 @@ "TooManyTagsException$Message": null } }, + "FunctionArnString": { + "base": null, + "refs": { + "LambdaInvokeOperation$FunctionArn": "The Amazon Resource Name (ARN) for the AWS Lambda function that the specified job will invoke for each object in the manifest.
" + } + }, "GetAccessPointPolicyRequest": { "base": null, "refs": { @@ -225,8 +232,8 @@ "IAMRoleArn": { "base": null, "refs": { - "CreateJobRequest$RoleArn": "The Amazon Resource Name (ARN) for the Identity and Access Management (IAM) Role that batch operations will use to execute this job's operation on each object in the manifest.
", - "JobDescriptor$RoleArn": "The Amazon Resource Name (ARN) for the Identity and Access Management (IAM) Role assigned to execute the tasks for this job.
" + "CreateJobRequest$RoleArn": "The Amazon Resource Name (ARN) for the AWS Identity and Access Management (IAM) role that Batch Operations will use to execute this job's operation on each object in the manifest.
", + "JobDescriptor$RoleArn": "The Amazon Resource Name (ARN) for the AWS Identity and Access Management (IAM) role assigned to execute the tasks for this job.
" } }, "IdempotencyException": { @@ -302,12 +309,12 @@ "base": null, "refs": { "CreateJobResult$JobId": "The ID for this job. Amazon S3 generates this ID automatically and returns it after a successful Create Job request.
The ID for the job whose tags you want to delete.
", + "DeleteJobTaggingRequest$JobId": "The ID for the Amazon S3 Batch Operations job whose tags you want to delete.
", "DescribeJobRequest$JobId": "The ID for the job whose information you want to retrieve.
", - "GetJobTaggingRequest$JobId": "The ID for the job whose tags you want to retrieve.
", + "GetJobTaggingRequest$JobId": "The ID for the Amazon S3 Batch Operations job whose tags you want to retrieve.
", "JobDescriptor$JobId": "The ID for the specified job.
", "JobListDescriptor$JobId": "The ID for the specified job.
", - "PutJobTaggingRequest$JobId": "The ID for the job whose tags you want to replace.
", + "PutJobTaggingRequest$JobId": "The ID for the Amazon S3 Batch Operations job whose tags you want to replace.
", "UpdateJobPriorityRequest$JobId": "The ID for the job whose priority you want to update.
", "UpdateJobPriorityResult$JobId": "The ID for the job whose priority Amazon S3 updated.
", "UpdateJobStatusRequest$JobId": "The ID of the job whose status you want to update.
", @@ -494,7 +501,6 @@ "MaxLength1024String": { "base": null, "refs": { - "S3Tag$Value": "", "S3UserMetadata$value": null } }, @@ -508,8 +514,8 @@ "NetworkOrigin": { "base": null, "refs": { - "AccessPoint$NetworkOrigin": "Indicates whether this access point allows access from the public Internet. If VpcConfiguration is specified for this access point, then NetworkOrigin is VPC, and the access point doesn't allow access from the public Internet. Otherwise, NetworkOrigin is Internet, and the access point allows access from the public Internet, subject to the access point and bucket access policies.
Indicates whether this access point allows access from the public Internet. If VpcConfiguration is specified for this access point, then NetworkOrigin is VPC, and the access point doesn't allow access from the public Internet. Otherwise, NetworkOrigin is Internet, and the access point allows access from the public Internet, subject to the access point and bucket access policies.
Indicates whether this access point allows access from the public internet. If VpcConfiguration is specified for this access point, then NetworkOrigin is VPC, and the access point doesn't allow access from the public internet. Otherwise, NetworkOrigin is Internet, and the access point allows access from the public internet, subject to the access point and bucket access policies.
Indicates whether this access point allows access from the public internet. If VpcConfiguration is specified for this access point, then NetworkOrigin is VPC, and the access point doesn't allow access from the public internet. Otherwise, NetworkOrigin is Internet, and the access point allows access from the public internet, subject to the access point and bucket access policies.
The ETag for the specified manifest object.
", - "LambdaInvokeOperation$FunctionArn": "The Amazon Resource Name (ARN) for the AWS Lambda function that the specified job will invoke for each object in the manifest.
", "ListAccessPointsRequest$NextToken": "A continuation token. If a previous call to ListAccessPoints returned a continuation token in the NextToken field, then providing that value here causes Amazon S3 to retrieve the next page of results.
If the specified bucket has more access points than can be returned in one call to this API, then this field contains a continuation token that you can provide in subsequent calls to this API to retrieve additional access points.
", - "ListJobsRequest$NextToken": "A pagination token to request the next page of results. Use the token that Amazon S3 returned in the NextToken element of the ListJobsResult from the previous List Jobs request.
If the List Jobs request produced more than the maximum number of results, you can pass this value into a subsequent List Jobs request in order to retrieve the next page of results.
Contains the configuration parameters for a PUT Copy object operation. Amazon S3 batch operations passes each value through to the underlying PUT Copy object API. For more information about the parameters for this operation, see PUT Object - Copy.
", + "base": "Contains the configuration parameters for a PUT Copy object operation. Amazon S3 Batch Operations passes each value through to the underlying PUT Copy object API. For more information about the parameters for this operation, see PUT Object - Copy.
", "refs": { "JobOperation$S3PutObjectCopy": "Directs the specified job to execute a PUT Copy object call on each object in the manifest.
" } @@ -708,7 +710,7 @@ } }, "S3InitiateRestoreObjectOperation": { - "base": "Contains the configuration parameters for an Initiate Glacier Restore job. Amazon S3 batch operations passes each value through to the underlying POST Object restore API. For more information about the parameters for this operation, see Restoring Archives.
", + "base": "Contains the configuration parameters for an Initiate Glacier Restore job. Amazon S3 Batch Operations passes each value through to the underlying POST Object restore API. For more information about the parameters for this operation, see Restoring Archives.
", "refs": { "JobOperation$S3InitiateRestoreObject": "Directs the specified job to execute an Initiate Glacier Restore call on each object in the manifest.
" } @@ -725,16 +727,29 @@ "S3CopyObjectOperation$MetadataDirective": "" } }, + "S3ObjectLockLegalHold": { + "base": "", + "refs": { + "S3SetObjectLegalHoldOperation$LegalHold": "The Legal Hold contains the status to be applied to all objects in the Batch Operations job.
" + } + }, "S3ObjectLockLegalHoldStatus": { "base": null, "refs": { - "S3CopyObjectOperation$ObjectLockLegalHoldStatus": "" + "S3CopyObjectOperation$ObjectLockLegalHoldStatus": "The Legal Hold status to be applied to all objects in the Batch Operations job.
", + "S3ObjectLockLegalHold$Status": "The Legal Hold status to be applied to all objects in the Batch Operations job.
" } }, "S3ObjectLockMode": { "base": null, "refs": { - "S3CopyObjectOperation$ObjectLockMode": "" + "S3CopyObjectOperation$ObjectLockMode": "The Retention mode to be applied to all objects in the Batch Operations job.
" + } + }, + "S3ObjectLockRetentionMode": { + "base": null, + "refs": { + "S3Retention$Mode": "The Retention mode to be applied to all objects in the Batch Operations job.
" } }, "S3ObjectMetadata": { @@ -761,6 +776,12 @@ "S3Grant$Permission": "" } }, + "S3Retention": { + "base": "", + "refs": { + "S3SetObjectRetentionOperation$Retention": "Amazon S3 object lock Retention contains the retention mode to be applied to all objects in the Batch Operations job.
" + } + }, "S3SSEAlgorithm": { "base": null, "refs": { @@ -768,13 +789,25 @@ } }, "S3SetObjectAclOperation": { - "base": "Contains the configuration parameters for a Set Object ACL operation. Amazon S3 batch operations passes each value through to the underlying PUT Object acl API. For more information about the parameters for this operation, see PUT Object acl.
", + "base": "Contains the configuration parameters for a Set Object ACL operation. Amazon S3 Batch Operations passes each value through to the underlying PUT Object acl API. For more information about the parameters for this operation, see PUT Object acl.
", "refs": { "JobOperation$S3PutObjectAcl": "Directs the specified job to execute a PUT Object acl call on each object in the manifest.
" } }, + "S3SetObjectLegalHoldOperation": { + "base": "Contains the configuration parameters for a Set Object Legal Hold operation. Amazon S3 Batch Operations passes each value through to the underlying PUT Object Legal Hold API. For more information about the parameters for this operation, see PUT Object Legal Hold.
", + "refs": { + "JobOperation$S3PutObjectLegalHold": null + } + }, + "S3SetObjectRetentionOperation": { + "base": "Contains the configuration parameters for a Set Object Retention operation. Amazon S3 Batch Operations passes each value through to the underlying PUT Object Retention API. For more information about the parameters for this operation, see PUT Object Retention.
", + "refs": { + "JobOperation$S3PutObjectRetention": null + } + }, "S3SetObjectTaggingOperation": { - "base": "Contains the configuration parameters for a Set Object Tagging operation. Amazon S3 batch operations passes each value through to the underlying PUT Object tagging API. For more information about the parameters for this operation, see PUT Object tagging.
", + "base": "Contains the configuration parameters for a Set Object Tagging operation. Amazon S3 Batch Operations passes each value through to the underlying PUT Object tagging API. For more information about the parameters for this operation, see PUT Object tagging.
", "refs": { "JobOperation$S3PutObjectTagging": "Directs the specified job to execute a PUT Object tagging call on each object in the manifest.
" } @@ -794,9 +827,9 @@ "S3TagSet": { "base": null, "refs": { - "CreateJobRequest$Tags": "An optional set of tags to associate with the job when it is created.
", - "GetJobTaggingResult$Tags": "The set of tags associated with the job.
", - "PutJobTaggingRequest$Tags": "The set of tags to associate with the job.
", + "CreateJobRequest$Tags": "A set of tags to associate with the Amazon S3 Batch Operations job. This is an optional parameter.
", + "GetJobTaggingResult$Tags": "The set of tags associated with the Amazon S3 Batch Operations job.
", + "PutJobTaggingRequest$Tags": "The set of tags to associate with the Amazon S3 Batch Operations job.
", "S3CopyObjectOperation$NewObjectTagging": "", "S3SetObjectTaggingOperation$TagSet": "" } @@ -816,6 +849,13 @@ "PublicAccessBlockConfiguration$RestrictPublicBuckets": "Specifies whether Amazon S3 should restrict public bucket policies for buckets in this account. Setting this element to TRUE restricts access to buckets with public policies to only AWS services and authorized users within this account.
Enabling this setting doesn't affect previously stored bucket policies, except that public and cross-account access within any public bucket policy, including non-public delegation to specific accounts, is blocked.
" } }, + "StringForNextToken": { + "base": null, + "refs": { + "ListJobsRequest$NextToken": "A pagination token to request the next page of results. Use the token that Amazon S3 returned in the NextToken element of the ListJobsResult from the previous List Jobs request.
If the List Jobs request produced more than the maximum number of results, you can pass this value into a subsequent List Jobs request in order to retrieve the next page of results.
The timestamp when this job was suspended, if it has been suspended.
" } }, + "TagKeyString": { + "base": null, + "refs": { + "S3Tag$Key": "" + } + }, + "TagValueString": { + "base": null, + "refs": { + "S3Tag$Value": "" + } + }, "TimeStamp": { "base": null, "refs": { "S3CopyObjectOperation$ModifiedSinceConstraint": "", "S3CopyObjectOperation$UnModifiedSinceConstraint": "", - "S3CopyObjectOperation$ObjectLockRetainUntilDate": "", - "S3ObjectMetadata$HttpExpiresDate": "" + "S3CopyObjectOperation$ObjectLockRetainUntilDate": "The date when the applied Object Retention configuration will expire on all objects in the Batch Operations job.
", + "S3ObjectMetadata$HttpExpiresDate": "", + "S3Retention$RetainUntilDate": "The date when the applied Object Retention will expire on all objects in the Batch Operations job.
" } }, "TooManyRequestsException": { @@ -843,7 +896,7 @@ } }, "TooManyTagsException": { - "base": null, + "base": "", "refs": { } }, @@ -868,11 +921,11 @@ } }, "VpcConfiguration": { - "base": "The Virtual Private Cloud (VPC) configuration for an access point.
", + "base": "The virtual private cloud (VPC) configuration for an access point.
", "refs": { - "AccessPoint$VpcConfiguration": "The Virtual Private Cloud (VPC) configuration for this access point, if one exists.
", - "CreateAccessPointRequest$VpcConfiguration": "If you include this field, Amazon S3 restricts access to this access point to requests from the specified Virtual Private Cloud (VPC).
", - "GetAccessPointResult$VpcConfiguration": "Contains the Virtual Private Cloud (VPC) configuration for the specified access point.
" + "AccessPoint$VpcConfiguration": "The virtual private cloud (VPC) configuration for this access point, if one exists.
", + "CreateAccessPointRequest$VpcConfiguration": "If you include this field, Amazon S3 restricts access to this access point to requests from the specified virtual private cloud (VPC).
", + "GetAccessPointResult$VpcConfiguration": "Contains the virtual private cloud (VPC) configuration for the specified access point.
" } }, "VpcId": { diff --git a/models/endpoints/endpoints.json b/models/endpoints/endpoints.json index 31dcb543e0..e110cafaba 100644 --- a/models/endpoints/endpoints.json +++ b/models/endpoints/endpoints.json @@ -7051,6 +7051,16 @@ "us-gov-west-1" : { } } }, + "pinpoint" : { + "defaults" : { + "credentialScope" : { + "service" : "mobiletargeting" + } + }, + "endpoints" : { + "us-gov-west-1" : { } + } + }, "polly" : { "endpoints" : { "fips-us-gov-west-1" : { diff --git a/service/apigateway/api.go b/service/apigateway/api.go index 85fde99ac1..15969f1907 100644 --- a/service/apigateway/api.go +++ b/service/apigateway/api.go @@ -18095,7 +18095,7 @@ func (s *GetModelTemplateInput) SetRestApiId(v string) *GetModelTemplateInput { type GetModelTemplateOutput struct { _ struct{} `type:"structure"` - // The Apache Velocity Template Language (VTL) (https://velocity.apache.org/engine/devel/vtl-reference-guide.html) + // The Apache Velocity Template Language (VTL) (https://velocity.apache.org/engine/devel/vtl-reference.html) // template content used for the template resource. Value *string `locationName:"value" type:"string"` } diff --git a/service/ec2/api.go b/service/ec2/api.go index 3d1d444aae..3dc4f9516c 100644 --- a/service/ec2/api.go +++ b/service/ec2/api.go @@ -26018,6 +26018,8 @@ func (c *EC2) DisableVpcClassicLinkDnsSupportRequest(input *DisableVpcClassicLin // ClassicLink (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html) // in the Amazon Elastic Compute Cloud User Guide. // +// You must specify a VPC ID in the request. +// // 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. @@ -26334,7 +26336,7 @@ func (c *EC2) DisassociateRouteTableRequest(input *DisassociateRouteTableInput) // DisassociateRouteTable API operation for Amazon Elastic Compute Cloud. // -// Disassociates a subnet from a route table. +// Disassociates a subnet or gateway from a route table. // // After you perform this action, the subnet no longer uses the routes in the // route table. Instead, it uses the routes in the VPC's main route table. For @@ -27204,6 +27206,8 @@ func (c *EC2) EnableVpcClassicLinkDnsSupportRequest(input *EnableVpcClassicLinkD // see ClassicLink (https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/vpc-classiclink.html) // in the Amazon Elastic Compute Cloud User Guide. // +// You must specify a VPC ID in the request. +// // 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. @@ -45783,8 +45787,6 @@ type CreateFlowLogsInput struct { // // Specify the fields using the ${field-id} format, separated by spaces. For // the AWS CLI, use single quotation marks (' ') to surround the parameter value. - // - // Only applicable to flow logs that are published to an Amazon S3 bucket. LogFormat *string `type:"string"` // The name of a new or existing CloudWatch Logs log group where Amazon EC2 @@ -70661,7 +70663,7 @@ type DisassociateRouteTableInput struct { _ struct{} `type:"structure"` // The association ID representing the current association between the route - // table and subnet. + // table and subnet or gateway. // // AssociationId is a required field AssociationId *string `locationName:"associationId" type:"string" required:"true"` diff --git a/service/s3control/api.go b/service/s3control/api.go index 675e4c5c77..88503e0fe5 100644 --- a/service/s3control/api.go +++ b/service/s3control/api.go @@ -136,7 +136,21 @@ func (c *S3Control) CreateJobRequest(input *CreateJobInput) (req *request.Reques // CreateJob API operation for AWS S3 Control. // -// Creates an Amazon S3 batch operations job. +// You can use Amazon S3 Batch Operations to perform large-scale Batch Operations +// on Amazon S3 objects. Amazon S3 Batch Operations can execute a single operation +// or action on lists of Amazon S3 objects that you specify. For more information, +// see Amazon S3 Batch Operations (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-basics.html) +// in the Amazon Simple Storage Service Developer Guide. +// +// Related actions include: +// +// * DescribeJob +// +// * ListJobs +// +// * UpdateJobPriority +// +// * UpdateJobStatus // // 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 @@ -377,7 +391,18 @@ func (c *S3Control) DeleteJobTaggingRequest(input *DeleteJobTaggingInput) (req * // DeleteJobTagging API operation for AWS S3 Control. // -// Delete the tags on a Amazon S3 batch operations job, if any. +// Removes the entire tag set from the specified Amazon S3 Batch Operations +// job. To use this operation, you must have permission to perform the s3:DeleteJobTagging +// action. For more information, see Using Job Tags (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-managing-jobs.html#batch-ops-job-tags) +// in the Amazon Simple Storage Service Developer Guide. +// +// Related actions include: +// +// * CreateJob +// +// * GetJobTagging +// +// * PutJobTagging // // 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 @@ -538,8 +563,19 @@ func (c *S3Control) DescribeJobRequest(input *DescribeJobInput) (req *request.Re // DescribeJob API operation for AWS S3 Control. // -// Retrieves the configuration parameters and status for a batch operations -// job. +// Retrieves the configuration parameters and status for a Batch Operations +// job. For more information, see Amazon S3 Batch Operations (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-basics.html) +// in the Amazon Simple Storage Service Developer Guide. +// +// Related actions include: +// +// * CreateJob +// +// * ListJobs +// +// * UpdateJobPriority +// +// * UpdateJobStatus // // 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 @@ -856,7 +892,18 @@ func (c *S3Control) GetJobTaggingRequest(input *GetJobTaggingInput) (req *reques // GetJobTagging API operation for AWS S3 Control. // -// Retrieve the tags on a Amazon S3 batch operations job. +// Returns the tags on an Amazon S3 Batch Operations job. To use this operation, +// you must have permission to perform the s3:GetJobTagging action. For more +// information, see Using Job Tags (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-managing-jobs.html#batch-ops-job-tags) +// in the Amazon Simple Storage Service Developer Guide. +// +// Related actions include: +// +// * CreateJob +// +// * PutJobTagging +// +// * DeleteJobTagging // // 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 @@ -1031,9 +1078,9 @@ func (c *S3Control) ListAccessPointsRequest(input *ListAccessPointsInput) (req * // // Returns a list of the access points currently associated with the specified // bucket. You can retrieve up to 1000 access points per call. If the specified -// bucket has more than 1000 access points (or the number specified in maxResults, -// whichever is less), then the response will include a continuation token that -// you can use to list the additional access points. +// bucket has more than 1,000 access points (or the number specified in maxResults, +// whichever is less), the response will include a continuation token that you +// can use to list the additional access points. // // 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 @@ -1167,8 +1214,20 @@ func (c *S3Control) ListJobsRequest(input *ListJobsInput) (req *request.Request, // ListJobs API operation for AWS S3 Control. // -// Lists current jobs and jobs that have ended within the last 30 days for the -// AWS account making the request. +// Lists current Amazon S3 Batch Operations jobs and jobs that have ended within +// the last 30 days for the AWS account making the request. For more information, +// see Amazon S3 Batch Operations (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-basics.html) +// in the Amazon Simple Storage Service Developer Guide. +// +// Related actions include: +// +// * CreateJob +// +// * DescribeJob +// +// * UpdateJobPriority +// +// * UpdateJobStatus // // 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 @@ -1384,7 +1443,44 @@ func (c *S3Control) PutJobTaggingRequest(input *PutJobTaggingInput) (req *reques // PutJobTagging API operation for AWS S3 Control. // -// Replace the set of tags on a Amazon S3 batch operations job. +// Set the supplied tag-set on an Amazon S3 Batch Operations job. +// +// A tag is a key-value pair. You can associate Amazon S3 Batch Operations tags +// with any job by sending a PUT request against the tagging subresource that +// is associated with the job. To modify the existing tag set, you can either +// replace the existing tag set entirely, or make changes within the existing +// tag set by retrieving the existing tag set using GetJobTagging, modify that +// tag set, and use this API action to replace the tag set with the one you +// have modified.. For more information, see Using Job Tags (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-managing-jobs.html#batch-ops-job-tags) +// in the Amazon Simple Storage Service Developer Guide. +// +// * If you send this request with an empty tag set, Amazon S3 deletes the +// existing tag set on the Batch Operations job. If you use this method, +// you will be charged for a Tier 1 Request (PUT). For more information, +// see Amazon S3 pricing (http://aws.amazon.com/s3/pricing/). +// +// * For deleting existing tags for your batch operations job, DeleteJobTagging +// request is preferred because it achieves the same result without incurring +// charges. +// +// * A few things to consider about using tags: Amazon S3 limits the maximum +// number of tags to 50 tags per job. You can associate up to 50 tags with +// a job as long as they have unique tag keys. A tag key can be up to 128 +// Unicode characters in length, and tag values can be up to 256 Unicode +// characters in length. The key and values are case sensitive. For tagging-related +// restrictions related to characters and encodings, see User-Defined Tag +// Restrictions (https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/allocation-tag-restrictions.html). +// +// To use this operation, you must have permission to perform the s3:PutJobTagging +// action. +// +// Related actions include: +// +// * CreateJob +// +// * GetJobTagging +// +// * DeleteJobTagging // // 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 @@ -1548,7 +1644,19 @@ func (c *S3Control) UpdateJobPriorityRequest(input *UpdateJobPriorityInput) (req // UpdateJobPriority API operation for AWS S3 Control. // -// Updates an existing job's priority. +// Updates an existing Amazon S3 Batch Operations job's priority. For more information, +// see Amazon S3 Batch Operations (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-basics.html) +// in the Amazon Simple Storage Service Developer Guide. +// +// Related actions include: +// +// * CreateJob +// +// * ListJobs +// +// * DescribeJob +// +// * UpdateJobStatus // // 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 @@ -1635,7 +1743,19 @@ func (c *S3Control) UpdateJobStatusRequest(input *UpdateJobStatusInput) (req *re // UpdateJobStatus API operation for AWS S3 Control. // // Updates the status for the specified job. Use this operation to confirm that -// you want to run a job or to cancel an existing job. +// you want to run a job or to cancel an existing job. For more information, +// see Amazon S3 Batch Operations (https://docs.aws.amazon.com/AmazonS3/latest/dev/batch-ops-basics.html) +// in the Amazon Simple Storage Service Developer Guide. +// +// Related actions include: +// +// * CreateJob +// +// * ListJobs +// +// * DescribeJob +// +// * UpdateJobStatus // // 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 @@ -1691,16 +1811,16 @@ type AccessPoint struct { // Name is a required field Name *string `min:"3" type:"string" required:"true"` - // Indicates whether this access point allows access from the public Internet. + // Indicates whether this access point allows access from the public internet. // If VpcConfiguration is specified for this access point, then NetworkOrigin - // is VPC, and the access point doesn't allow access from the public Internet. + // is VPC, and the access point doesn't allow access from the public internet. // Otherwise, NetworkOrigin is Internet, and the access point allows access - // from the public Internet, subject to the access point and bucket access policies. + // from the public internet, subject to the access point and bucket access policies. // // NetworkOrigin is a required field NetworkOrigin *string `type:"string" required:"true" enum:"NetworkOrigin"` - // The Virtual Private Cloud (VPC) configuration for this access point, if one + // The virtual private cloud (VPC) configuration for this access point, if one // exists. VpcConfiguration *VpcConfiguration `type:"structure"` } @@ -1766,7 +1886,7 @@ type CreateAccessPointInput struct { PublicAccessBlockConfiguration *PublicAccessBlockConfiguration `type:"structure"` // If you include this field, Amazon S3 restricts access to this access point - // to requests from the specified Virtual Private Cloud (VPC). + // to requests from the specified virtual private cloud (VPC). VpcConfiguration *VpcConfiguration `type:"structure"` } @@ -1904,14 +2024,15 @@ type CreateJobInput struct { // Report is a required field Report *JobReport `type:"structure" required:"true"` - // The Amazon Resource Name (ARN) for the Identity and Access Management (IAM) - // Role that batch operations will use to execute this job's operation on each - // object in the manifest. + // The Amazon Resource Name (ARN) for the AWS Identity and Access Management + // (IAM) role that Batch Operations will use to execute this job's operation + // on each object in the manifest. // // RoleArn is a required field RoleArn *string `min:"1" type:"string" required:"true"` - // An optional set of tags to associate with the job when it is created. + // A set of tags to associate with the Amazon S3 Batch Operations job. This + // is an optional parameter. Tags []*S3Tag `type:"list"` } @@ -2239,13 +2360,12 @@ func (s DeleteAccessPointPolicyOutput) GoString() string { type DeleteJobTaggingInput struct { _ struct{} `locationName:"DeleteJobTaggingRequest" type:"structure"` - // The account ID for the Amazon Web Services account associated with the Amazon - // S3 batch operations job you want to remove tags from. + // The AWS account ID associated with the Amazon S3 Batch Operations job. // // AccountId is a required field AccountId *string `location:"header" locationName:"x-amz-account-id" type:"string" required:"true"` - // The ID for the job whose tags you want to delete. + // The ID for the Amazon S3 Batch Operations job whose tags you want to delete. // // JobId is a required field JobId *string `location:"uri" locationName:"id" min:"5" type:"string" required:"true"` @@ -2540,11 +2660,11 @@ type GetAccessPointOutput struct { // The name of the specified access point. Name *string `min:"3" type:"string"` - // Indicates whether this access point allows access from the public Internet. + // Indicates whether this access point allows access from the public internet. // If VpcConfiguration is specified for this access point, then NetworkOrigin - // is VPC, and the access point doesn't allow access from the public Internet. + // is VPC, and the access point doesn't allow access from the public internet. // Otherwise, NetworkOrigin is Internet, and the access point allows access - // from the public Internet, subject to the access point and bucket access policies. + // from the public internet, subject to the access point and bucket access policies. NetworkOrigin *string `type:"string" enum:"NetworkOrigin"` // The PublicAccessBlock configuration that you want to apply to this Amazon @@ -2554,7 +2674,7 @@ type GetAccessPointOutput struct { // in the Amazon Simple Storage Service Developer Guide. PublicAccessBlockConfiguration *PublicAccessBlockConfiguration `type:"structure"` - // Contains the Virtual Private Cloud (VPC) configuration for the specified + // Contains the virtual private cloud (VPC) configuration for the specified // access point. VpcConfiguration *VpcConfiguration `type:"structure"` } @@ -2782,13 +2902,12 @@ func (s *GetAccessPointPolicyStatusOutput) SetPolicyStatus(v *PolicyStatus) *Get type GetJobTaggingInput struct { _ struct{} `locationName:"GetJobTaggingRequest" type:"structure"` - // The account ID for the Amazon Web Services account associated with the Amazon - // S3 batch operations job you want to retrieve tags for. + // The AWS account ID associated with the Amazon S3 Batch Operations job. // // AccountId is a required field AccountId *string `location:"header" locationName:"x-amz-account-id" type:"string" required:"true"` - // The ID for the job whose tags you want to retrieve. + // The ID for the Amazon S3 Batch Operations job whose tags you want to retrieve. // // JobId is a required field JobId *string `location:"uri" locationName:"id" min:"5" type:"string" required:"true"` @@ -2847,7 +2966,7 @@ func (s *GetJobTaggingInput) hostLabels() map[string]string { type GetJobTaggingOutput struct { _ struct{} `type:"structure"` - // The set of tags associated with the job. + // The set of tags associated with the Amazon S3 Batch Operations job. Tags []*S3Tag `type:"list"` } @@ -2984,8 +3103,8 @@ type JobDescriptor struct { // requested one in the Create Job request. Report *JobReport `type:"structure"` - // The Amazon Resource Name (ARN) for the Identity and Access Management (IAM) - // Role assigned to execute the tasks for this job. + // The Amazon Resource Name (ARN) for the AWS Identity and Access Management + // (IAM) role assigned to execute the tasks for this job. RoleArn *string `min:"1" type:"string"` // The current status of the specified job. @@ -3452,6 +3571,18 @@ type JobOperation struct { // in the manifest. S3PutObjectCopy *S3CopyObjectOperation `type:"structure"` + // Contains the configuration parameters for a Set Object Legal Hold operation. + // Amazon S3 Batch Operations passes each value through to the underlying PUT + // Object Legal Hold API. For more information about the parameters for this + // operation, see PUT Object Legal Hold (https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock-overview.htmll#object-lock-legal-holds). + S3PutObjectLegalHold *S3SetObjectLegalHoldOperation `type:"structure"` + + // Contains the configuration parameters for a Set Object Retention operation. + // Amazon S3 Batch Operations passes each value through to the underlying PUT + // Object Retention API. For more information about the parameters for this + // operation, see PUT Object Retention (https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock-overview.html#object-lock-retention-modes). + S3PutObjectRetention *S3SetObjectRetentionOperation `type:"structure"` + // Directs the specified job to execute a PUT Object tagging call on each object // in the manifest. S3PutObjectTagging *S3SetObjectTaggingOperation `type:"structure"` @@ -3485,6 +3616,16 @@ func (s *JobOperation) Validate() error { invalidParams.AddNested("S3PutObjectCopy", err.(request.ErrInvalidParams)) } } + if s.S3PutObjectLegalHold != nil { + if err := s.S3PutObjectLegalHold.Validate(); err != nil { + invalidParams.AddNested("S3PutObjectLegalHold", err.(request.ErrInvalidParams)) + } + } + if s.S3PutObjectRetention != nil { + if err := s.S3PutObjectRetention.Validate(); err != nil { + invalidParams.AddNested("S3PutObjectRetention", err.(request.ErrInvalidParams)) + } + } if s.S3PutObjectTagging != nil { if err := s.S3PutObjectTagging.Validate(); err != nil { invalidParams.AddNested("S3PutObjectTagging", err.(request.ErrInvalidParams)) @@ -3521,6 +3662,18 @@ func (s *JobOperation) SetS3PutObjectCopy(v *S3CopyObjectOperation) *JobOperatio return s } +// SetS3PutObjectLegalHold sets the S3PutObjectLegalHold field's value. +func (s *JobOperation) SetS3PutObjectLegalHold(v *S3SetObjectLegalHoldOperation) *JobOperation { + s.S3PutObjectLegalHold = v + return s +} + +// SetS3PutObjectRetention sets the S3PutObjectRetention field's value. +func (s *JobOperation) SetS3PutObjectRetention(v *S3SetObjectRetentionOperation) *JobOperation { + s.S3PutObjectRetention = v + return s +} + // SetS3PutObjectTagging sets the S3PutObjectTagging field's value. func (s *JobOperation) SetS3PutObjectTagging(v *S3SetObjectTaggingOperation) *JobOperation { s.S3PutObjectTagging = v @@ -4140,18 +4293,17 @@ func (s PutAccessPointPolicyOutput) GoString() string { type PutJobTaggingInput struct { _ struct{} `locationName:"PutJobTaggingRequest" type:"structure" xmlURI:"http://awss3control.amazonaws.com/doc/2018-08-20/"` - // The account ID for the Amazon Web Services account associated with the Amazon - // S3 batch operations job you want to replace tags on. + // The AWS account ID associated with the Amazon S3 Batch Operations job. // // AccountId is a required field AccountId *string `location:"header" locationName:"x-amz-account-id" type:"string" required:"true"` - // The ID for the job whose tags you want to replace. + // The ID for the Amazon S3 Batch Operations job whose tags you want to replace. // // JobId is a required field JobId *string `location:"uri" locationName:"id" min:"5" type:"string" required:"true"` - // The set of tags to associate with the job. + // The set of tags to associate with the Amazon S3 Batch Operations job. // // Tags is a required field Tags []*S3Tag `type:"list" required:"true"` @@ -4422,7 +4574,7 @@ func (s *S3AccessControlPolicy) SetCannedAccessControlList(v string) *S3AccessCo } // Contains the configuration parameters for a PUT Copy object operation. Amazon -// S3 batch operations passes each value through to the underlying PUT Copy +// S3 Batch Operations passes each value through to the underlying PUT Copy // object API. For more information about the parameters for this operation, // see PUT Object - Copy (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectCOPY.html). type S3CopyObjectOperation struct { @@ -4440,10 +4592,15 @@ type S3CopyObjectOperation struct { NewObjectTagging []*S3Tag `type:"list"` + // The Legal Hold status to be applied to all objects in the Batch Operations + // job. ObjectLockLegalHoldStatus *string `type:"string" enum:"S3ObjectLockLegalHoldStatus"` + // The Retention mode to be applied to all objects in the Batch Operations job. ObjectLockMode *string `type:"string" enum:"S3ObjectLockMode"` + // The date when the applied Object Retention configuration will expire on all + // objects in the Batch Operations job. ObjectLockRetainUntilDate *time.Time `type:"timestamp"` RedirectLocation *string `min:"1" type:"string"` @@ -4714,7 +4871,7 @@ func (s *S3Grantee) SetTypeIdentifier(v string) *S3Grantee { } // Contains the configuration parameters for an Initiate Glacier Restore job. -// Amazon S3 batch operations passes each value through to the underlying POST +// Amazon S3 Batch Operations passes each value through to the underlying POST // Object restore API. For more information about the parameters for this operation, // see Restoring Archives (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPOSTrestore.html#RESTObjectPOSTrestore-restore-request). type S3InitiateRestoreObjectOperation struct { @@ -4747,6 +4904,45 @@ func (s *S3InitiateRestoreObjectOperation) SetGlacierJobTier(v string) *S3Initia return s } +type S3ObjectLockLegalHold struct { + _ struct{} `type:"structure"` + + // The Legal Hold status to be applied to all objects in the Batch Operations + // job. + // + // Status is a required field + Status *string `type:"string" required:"true" enum:"S3ObjectLockLegalHoldStatus"` +} + +// String returns the string representation +func (s S3ObjectLockLegalHold) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s S3ObjectLockLegalHold) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *S3ObjectLockLegalHold) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "S3ObjectLockLegalHold"} + if s.Status == nil { + invalidParams.Add(request.NewErrParamRequired("Status")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetStatus sets the Status field's value. +func (s *S3ObjectLockLegalHold) SetStatus(v string) *S3ObjectLockLegalHold { + s.Status = &v + return s +} + type S3ObjectMetadata struct { _ struct{} `type:"structure"` @@ -4923,8 +5119,41 @@ func (s *S3ObjectOwner) SetID(v string) *S3ObjectOwner { return s } +type S3Retention struct { + _ struct{} `type:"structure"` + + // The Retention mode to be applied to all objects in the Batch Operations job. + Mode *string `type:"string" enum:"S3ObjectLockRetentionMode"` + + // The date when the applied Object Retention will expire on all objects in + // the Batch Operations job. + RetainUntilDate *time.Time `type:"timestamp"` +} + +// String returns the string representation +func (s S3Retention) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s S3Retention) GoString() string { + return s.String() +} + +// SetMode sets the Mode field's value. +func (s *S3Retention) SetMode(v string) *S3Retention { + s.Mode = &v + return s +} + +// SetRetainUntilDate sets the RetainUntilDate field's value. +func (s *S3Retention) SetRetainUntilDate(v time.Time) *S3Retention { + s.RetainUntilDate = &v + return s +} + // Contains the configuration parameters for a Set Object ACL operation. Amazon -// S3 batch operations passes each value through to the underlying PUT Object +// S3 Batch Operations passes each value through to the underlying PUT Object // acl API. For more information about the parameters for this operation, see // PUT Object acl (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUTacl.html). type S3SetObjectAclOperation struct { @@ -4964,8 +5193,109 @@ func (s *S3SetObjectAclOperation) SetAccessControlPolicy(v *S3AccessControlPolic return s } +// Contains the configuration parameters for a Set Object Legal Hold operation. +// Amazon S3 Batch Operations passes each value through to the underlying PUT +// Object Legal Hold API. For more information about the parameters for this +// operation, see PUT Object Legal Hold (https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock-overview.htmll#object-lock-legal-holds). +type S3SetObjectLegalHoldOperation struct { + _ struct{} `type:"structure"` + + // The Legal Hold contains the status to be applied to all objects in the Batch + // Operations job. + // + // LegalHold is a required field + LegalHold *S3ObjectLockLegalHold `type:"structure" required:"true"` +} + +// String returns the string representation +func (s S3SetObjectLegalHoldOperation) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s S3SetObjectLegalHoldOperation) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *S3SetObjectLegalHoldOperation) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "S3SetObjectLegalHoldOperation"} + if s.LegalHold == nil { + invalidParams.Add(request.NewErrParamRequired("LegalHold")) + } + if s.LegalHold != nil { + if err := s.LegalHold.Validate(); err != nil { + invalidParams.AddNested("LegalHold", err.(request.ErrInvalidParams)) + } + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetLegalHold sets the LegalHold field's value. +func (s *S3SetObjectLegalHoldOperation) SetLegalHold(v *S3ObjectLockLegalHold) *S3SetObjectLegalHoldOperation { + s.LegalHold = v + return s +} + +// Contains the configuration parameters for a Set Object Retention operation. +// Amazon S3 Batch Operations passes each value through to the underlying PUT +// Object Retention API. For more information about the parameters for this +// operation, see PUT Object Retention (https://docs.aws.amazon.com/AmazonS3/latest/dev/object-lock-overview.html#object-lock-retention-modes). +type S3SetObjectRetentionOperation struct { + _ struct{} `type:"structure"` + + // Indicates if the operation should be applied to objects in the Batch Operations + // job even if they have Governance-type Object Lock in place. + BypassGovernanceRetention *bool `type:"boolean"` + + // Amazon S3 object lock Retention contains the retention mode to be applied + // to all objects in the Batch Operations job. + // + // Retention is a required field + Retention *S3Retention `type:"structure" required:"true"` +} + +// String returns the string representation +func (s S3SetObjectRetentionOperation) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s S3SetObjectRetentionOperation) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *S3SetObjectRetentionOperation) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "S3SetObjectRetentionOperation"} + if s.Retention == nil { + invalidParams.Add(request.NewErrParamRequired("Retention")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetBypassGovernanceRetention sets the BypassGovernanceRetention field's value. +func (s *S3SetObjectRetentionOperation) SetBypassGovernanceRetention(v bool) *S3SetObjectRetentionOperation { + s.BypassGovernanceRetention = &v + return s +} + +// SetRetention sets the Retention field's value. +func (s *S3SetObjectRetentionOperation) SetRetention(v *S3Retention) *S3SetObjectRetentionOperation { + s.Retention = v + return s +} + // Contains the configuration parameters for a Set Object Tagging operation. -// Amazon S3 batch operations passes each value through to the underlying PUT +// Amazon S3 Batch Operations passes each value through to the underlying PUT // Object tagging API. For more information about the parameters for this operation, // see PUT Object tagging (https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUTtagging.html). type S3SetObjectTaggingOperation struct { @@ -5303,7 +5633,7 @@ func (s *UpdateJobStatusOutput) SetStatusUpdateReason(v string) *UpdateJobStatus return s } -// The Virtual Private Cloud (VPC) configuration for an access point. +// The virtual private cloud (VPC) configuration for an access point. type VpcConfiguration struct { _ struct{} `type:"structure"` @@ -5445,6 +5775,12 @@ const ( // OperationNameS3initiateRestoreObject is a OperationName enum value OperationNameS3initiateRestoreObject = "S3InitiateRestoreObject" + + // OperationNameS3putObjectLegalHold is a OperationName enum value + OperationNameS3putObjectLegalHold = "S3PutObjectLegalHold" + + // OperationNameS3putObjectRetention is a OperationName enum value + OperationNameS3putObjectRetention = "S3PutObjectRetention" ) const ( @@ -5521,6 +5857,14 @@ const ( S3ObjectLockModeGovernance = "GOVERNANCE" ) +const ( + // S3ObjectLockRetentionModeCompliance is a S3ObjectLockRetentionMode enum value + S3ObjectLockRetentionModeCompliance = "COMPLIANCE" + + // S3ObjectLockRetentionModeGovernance is a S3ObjectLockRetentionMode enum value + S3ObjectLockRetentionModeGovernance = "GOVERNANCE" +) + const ( // S3PermissionFullControl is a S3Permission enum value S3PermissionFullControl = "FULL_CONTROL"