diff --git a/CHANGELOG.md b/CHANGELOG.md index 192fdd0dc5..fbd095d6cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +Release v1.15.32 (2018-09-10) +=== + +### Service Client Updates +* `service/cloudhsmv2`: Updates service API and documentation + * With this release, we are adding 2 new APIs. DeleteBackup deletes a specified AWS CloudHSM backup. A backup can be restored up to 7 days after the DeleteBackup request. During this 7-day period, the backup will be in state PENDING_DELETION. Backups can be restored using the RestoreBackup API, which will move the backup from state PENDING_DELETION back to ACTIVE. +* `aws/endpoints`: Updated Regions and Endpoints metadata. +* `service/redshift`: Updates service API and documentation + * Adding support to Redshift to change the encryption type after cluster creation completes. + Release v1.15.31 (2018-09-07) === diff --git a/aws/endpoints/defaults.go b/aws/endpoints/defaults.go index 47952a80ba..005bde0daa 100644 --- a/aws/endpoints/defaults.go +++ b/aws/endpoints/defaults.go @@ -1088,6 +1088,7 @@ var awsPartition = partition{ Endpoints: endpoints{ "ap-northeast-1": endpoint{}, "ap-northeast-2": endpoint{}, + "ap-southeast-1": endpoint{}, "ap-southeast-2": endpoint{}, "eu-central-1": endpoint{}, "eu-west-1": endpoint{}, @@ -1281,6 +1282,7 @@ var awsPartition = partition{ "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, "eu-west-3": endpoint{}, + "sa-east-1": endpoint{}, "us-east-1": endpoint{}, "us-east-2": endpoint{}, "us-west-1": endpoint{}, @@ -2002,6 +2004,7 @@ var awsPartition = partition{ "eu-central-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, + "eu-west-3": endpoint{}, "sa-east-1": endpoint{}, "us-east-1": endpoint{}, "us-east-1-fips": endpoint{ @@ -2105,11 +2108,16 @@ var awsPartition = partition{ "servicediscovery": service{ Endpoints: endpoints{ - "eu-west-1": endpoint{}, - "us-east-1": endpoint{}, - "us-east-2": endpoint{}, - "us-west-1": endpoint{}, - "us-west-2": endpoint{}, + "ap-northeast-1": endpoint{}, + "ap-southeast-1": endpoint{}, + "ap-southeast-2": endpoint{}, + "eu-central-1": endpoint{}, + "eu-west-1": endpoint{}, + "eu-west-2": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, }, }, "shield": service{ @@ -2431,8 +2439,26 @@ var awsPartition = partition{ Endpoints: endpoints{ "eu-west-1": endpoint{}, "us-east-1": endpoint{}, + "us-east-1-fips": endpoint{ + Hostname: "translate-fips.us-east-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-1", + }, + }, "us-east-2": endpoint{}, + "us-east-2-fips": endpoint{ + Hostname: "translate-fips.us-east-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-east-2", + }, + }, "us-west-2": endpoint{}, + "us-west-2-fips": endpoint{ + Hostname: "translate-fips.us-west-2.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-west-2", + }, + }, }, }, "waf": service{ @@ -2919,6 +2945,12 @@ var awsusgovPartition = partition{ "us-gov-west-1": endpoint{}, }, }, + "application-autoscaling": service{ + + Endpoints: endpoints{ + "us-gov-west-1": endpoint{}, + }, + }, "autoscaling": service{ Endpoints: endpoints{ @@ -3271,6 +3303,12 @@ var awsusgovPartition = partition{ }, Endpoints: endpoints{ "us-gov-west-1": endpoint{}, + "us-gov-west-1-fips": endpoint{ + Hostname: "translate-fips.us-gov-west-1.amazonaws.com", + CredentialScope: credentialScope{ + Region: "us-gov-west-1", + }, + }, }, }, }, diff --git a/aws/version.go b/aws/version.go index 56436f8c8f..a35a092859 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.15.31" +const SDKVersion = "1.15.32" diff --git a/models/apis/cloudhsmv2/2017-04-28/api-2.json b/models/apis/cloudhsmv2/2017-04-28/api-2.json index c8dbcaae07..872de43fa3 100644 --- a/models/apis/cloudhsmv2/2017-04-28/api-2.json +++ b/models/apis/cloudhsmv2/2017-04-28/api-2.json @@ -62,6 +62,22 @@ {"shape":"CloudHsmAccessDeniedException"} ] }, + "DeleteBackup":{ + "name":"DeleteBackup", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"DeleteBackupRequest"}, + "output":{"shape":"DeleteBackupResponse"}, + "errors":[ + {"shape":"CloudHsmInternalFailureException"}, + {"shape":"CloudHsmServiceException"}, + {"shape":"CloudHsmResourceNotFoundException"}, + {"shape":"CloudHsmInvalidRequestException"}, + {"shape":"CloudHsmAccessDeniedException"} + ] + }, "DeleteCluster":{ "name":"DeleteCluster", "http":{ @@ -157,6 +173,22 @@ {"shape":"CloudHsmAccessDeniedException"} ] }, + "RestoreBackup":{ + "name":"RestoreBackup", + "http":{ + "method":"POST", + "requestUri":"/" + }, + "input":{"shape":"RestoreBackupRequest"}, + "output":{"shape":"RestoreBackupResponse"}, + "errors":[ + {"shape":"CloudHsmInternalFailureException"}, + {"shape":"CloudHsmServiceException"}, + {"shape":"CloudHsmResourceNotFoundException"}, + {"shape":"CloudHsmInvalidRequestException"}, + {"shape":"CloudHsmAccessDeniedException"} + ] + }, "TagResource":{ "name":"TagResource", "http":{ @@ -202,7 +234,8 @@ "CopyTimestamp":{"shape":"Timestamp"}, "SourceRegion":{"shape":"Region"}, "SourceBackup":{"shape":"BackupId"}, - "SourceCluster":{"shape":"ClusterId"} + "SourceCluster":{"shape":"ClusterId"}, + "DeleteTimestamp":{"shape":"Timestamp"} } }, "BackupId":{ @@ -218,7 +251,8 @@ "enum":[ "CREATE_IN_PROGRESS", "READY", - "DELETED" + "DELETED", + "PENDING_DELETION" ] }, "Backups":{ @@ -370,6 +404,19 @@ "Hsm":{"shape":"Hsm"} } }, + "DeleteBackupRequest":{ + "type":"structure", + "required":["BackupId"], + "members":{ + "BackupId":{"shape":"BackupId"} + } + }, + "DeleteBackupResponse":{ + "type":"structure", + "members":{ + "Backup":{"shape":"Backup"} + } + }, "DeleteClusterRequest":{ "type":"structure", "required":["ClusterId"], @@ -557,6 +604,19 @@ "type":"string", "pattern":"[a-z]{2}(-(gov))?-(east|west|north|south|central){1,2}-\\d" }, + "RestoreBackupRequest":{ + "type":"structure", + "required":["BackupId"], + "members":{ + "BackupId":{"shape":"BackupId"} + } + }, + "RestoreBackupResponse":{ + "type":"structure", + "members":{ + "Backup":{"shape":"Backup"} + } + }, "SecurityGroup":{ "type":"string", "pattern":"sg-[0-9a-fA-F]" diff --git a/models/apis/cloudhsmv2/2017-04-28/docs-2.json b/models/apis/cloudhsmv2/2017-04-28/docs-2.json index 1782c57785..10faffa942 100644 --- a/models/apis/cloudhsmv2/2017-04-28/docs-2.json +++ b/models/apis/cloudhsmv2/2017-04-28/docs-2.json @@ -2,15 +2,17 @@ "version": "2.0", "service": "

For more information about AWS CloudHSM, see AWS CloudHSM and the AWS CloudHSM User Guide.

", "operations": { - "CopyBackupToRegion": null, + "CopyBackupToRegion": "

Copy an AWS CloudHSM cluster backup to a different region.

", "CreateCluster": "

Creates a new AWS CloudHSM cluster.

", "CreateHsm": "

Creates a new hardware security module (HSM) in the specified AWS CloudHSM cluster.

", + "DeleteBackup": "

Deletes a specified AWS CloudHSM backup. A backup can be restored up to 7 days after the DeleteBackup request. For more information on restoring a backup, see RestoreBackup

", "DeleteCluster": "

Deletes the specified AWS CloudHSM cluster. Before you can delete a cluster, you must delete all HSMs in the cluster. To see if the cluster contains any HSMs, use DescribeClusters. To delete an HSM, use DeleteHsm.

", "DeleteHsm": "

Deletes the specified HSM. To specify an HSM, you can use its identifier (ID), the IP address of the HSM's elastic network interface (ENI), or the ID of the HSM's ENI. You need to specify only one of these values. To find these values, use DescribeClusters.

", "DescribeBackups": "

Gets information about backups of AWS CloudHSM clusters.

This is a paginated operation, which means that each response might contain only a subset of all the backups. When the response contains only a subset of backups, it includes a NextToken value. Use this value in a subsequent DescribeBackups request to get more backups. When you receive a response with no NextToken (or an empty or null value), that means there are no more backups to get.

", "DescribeClusters": "

Gets information about AWS CloudHSM clusters.

This is a paginated operation, which means that each response might contain only a subset of all the clusters. When the response contains only a subset of clusters, it includes a NextToken value. Use this value in a subsequent DescribeClusters request to get more clusters. When you receive a response with no NextToken (or an empty or null value), that means there are no more clusters to get.

", "InitializeCluster": "

Claims an AWS CloudHSM cluster by submitting the cluster certificate issued by your issuing certificate authority (CA) and the CA's root certificate. Before you can claim a cluster, you must sign the cluster's certificate signing request (CSR) with your issuing CA. To get the cluster's CSR, use DescribeClusters.

", "ListTags": "

Gets a list of tags for the specified AWS CloudHSM cluster.

This is a paginated operation, which means that each response might contain only a subset of all the tags. When the response contains only a subset of tags, it includes a NextToken value. Use this value in a subsequent ListTags request to get more tags. When you receive a response with no NextToken (or an empty or null value), that means there are no more tags to get.

", + "RestoreBackup": "

Restores a specified AWS CloudHSM backup that is in the PENDING_DELETION state. For more information on deleting a backup, see DeleteBackup.

", "TagResource": "

Adds or overwrites one or more tags for the specified AWS CloudHSM cluster.

", "UntagResource": "

Removes the specified tag or tags from the specified AWS CloudHSM cluster.

" }, @@ -18,7 +20,9 @@ "Backup": { "base": "

Contains information about a backup of an AWS CloudHSM cluster.

", "refs": { - "Backups$member": null + "Backups$member": null, + "DeleteBackupResponse$Backup": "

Information on the Backup object deleted.

", + "RestoreBackupResponse$Backup": "

Information on the Backup object created.

" } }, "BackupId": { @@ -27,9 +31,11 @@ "Backup$BackupId": "

The identifier (ID) of the backup.

", "Backup$SourceBackup": null, "Cluster$SourceBackupId": "

The identifier (ID) of the backup used to create the cluster. This value exists only when the cluster was created from a backup.

", - "CopyBackupToRegionRequest$BackupId": null, + "CopyBackupToRegionRequest$BackupId": "

The ID of the backup that will be copied to the destination region.

", "CreateClusterRequest$SourceBackupId": "

The identifier (ID) of the cluster backup to restore. Use this value to restore the cluster from a backup instead of creating a new cluster. To find the backup ID, use DescribeBackups.

", - "DestinationBackup$SourceBackup": null + "DeleteBackupRequest$BackupId": "

The ID of the backup to be deleted. To find the ID of a backup, use the DescribeBackups operation.

", + "DestinationBackup$SourceBackup": null, + "RestoreBackupRequest$BackupId": "

The ID of the backup to be restored. To find the ID of a backup, use the DescribeBackups operation.

" } }, "BackupPolicy": { @@ -167,6 +173,16 @@ "refs": { } }, + "DeleteBackupRequest": { + "base": null, + "refs": { + } + }, + "DeleteBackupResponse": { + "base": null, + "refs": { + } + }, "DeleteClusterRequest": { "base": null, "refs": { @@ -210,7 +226,7 @@ "DestinationBackup": { "base": null, "refs": { - "CopyBackupToRegionResponse$DestinationBackup": null + "CopyBackupToRegionResponse$DestinationBackup": "

Information on the backup that will be copied to the destination region, including CreateTimestamp, SourceBackup, SourceCluster, and Source Region. CreateTimestamp of the destination backup will be the same as that of the source backup.

You will need to use the sourceBackupID returned in this operation to use the DescribeBackups operation on the backup that will be copied to the destination region.

" } }, "EniId": { @@ -243,7 +259,7 @@ "Filters": { "base": null, "refs": { - "DescribeBackupsRequest$Filters": "

One or more filters to limit the items returned in the response.

Use the backupIds filter to return only the specified backups. Specify backups by their backup identifier (ID).

Use the clusterIds filter to return only the backups for the specified clusters. Specify clusters by their cluster identifier (ID).

Use the states filter to return only backups that match the specified state.

", + "DescribeBackupsRequest$Filters": "

One or more filters to limit the items returned in the response.

Use the backupIds filter to return only the specified backups. Specify backups by their backup identifier (ID).

Use the sourceBackupIds filter to return only the backups created from a source backup. The sourceBackupID of a source backup is returned by the CopyBackupToRegion operation.

Use the clusterIds filter to return only the backups for the specified clusters. Specify clusters by their cluster identifier (ID).

Use the states filter to return only backups that match the specified state.

", "DescribeClustersRequest$Filters": "

One or more filters to limit the items returned in the response.

Use the clusterIds filter to return only the specified clusters. Specify clusters by their cluster identifier (ID).

Use the vpcIds filter to return only the clusters in the specified virtual private clouds (VPCs). Specify VPCs by their VPC identifier (ID).

Use the states filter to return only clusters that match the specified state.

" } }, @@ -338,10 +354,20 @@ "base": null, "refs": { "Backup$SourceRegion": null, - "CopyBackupToRegionRequest$DestinationRegion": null, + "CopyBackupToRegionRequest$DestinationRegion": "

The AWS region that will contain your copied CloudHSM cluster backup.

", "DestinationBackup$SourceRegion": null } }, + "RestoreBackupRequest": { + "base": null, + "refs": { + } + }, + "RestoreBackupResponse": { + "base": null, + "refs": { + } + }, "SecurityGroup": { "base": null, "refs": { @@ -429,6 +455,7 @@ "refs": { "Backup$CreateTimestamp": "

The date and time when the backup was created.

", "Backup$CopyTimestamp": null, + "Backup$DeleteTimestamp": "

The date and time when the backup will be permanently deleted.

", "Cluster$CreateTimestamp": "

The date and time when the cluster was created.

", "DestinationBackup$CreateTimestamp": null } diff --git a/models/apis/redshift/2012-12-01/api-2.json b/models/apis/redshift/2012-12-01/api-2.json index bcb4fb142d..21fda4edce 100644 --- a/models/apis/redshift/2012-12-01/api-2.json +++ b/models/apis/redshift/2012-12-01/api-2.json @@ -3137,7 +3137,9 @@ "PubliclyAccessible":{"shape":"BooleanOptional"}, "ElasticIp":{"shape":"String"}, "EnhancedVpcRouting":{"shape":"BooleanOptional"}, - "MaintenanceTrackName":{"shape":"String"} + "MaintenanceTrackName":{"shape":"String"}, + "Encrypted":{"shape":"BooleanOptional"}, + "KmsKeyId":{"shape":"String"} } }, "ModifyClusterParameterGroupMessage":{ @@ -3308,7 +3310,8 @@ "ClusterIdentifier":{"shape":"String"}, "PubliclyAccessible":{"shape":"BooleanOptional"}, "EnhancedVpcRouting":{"shape":"BooleanOptional"}, - "MaintenanceTrackName":{"shape":"String"} + "MaintenanceTrackName":{"shape":"String"}, + "EncryptionType":{"shape":"String"} } }, "PurchaseReservedNodeOfferingMessage":{ @@ -3533,7 +3536,8 @@ "ElapsedTimeInSeconds":{"shape":"LongOptional"}, "EstimatedTimeToCompletionInSeconds":{"shape":"LongOptional"}, "ResizeType":{"shape":"String"}, - "Message":{"shape":"String"} + "Message":{"shape":"String"}, + "TargetEncryptionType":{"shape":"String"} } }, "ResourceNotFoundFault":{ diff --git a/models/apis/redshift/2012-12-01/docs-2.json b/models/apis/redshift/2012-12-01/docs-2.json index 339ca23204..f6986a919a 100644 --- a/models/apis/redshift/2012-12-01/docs-2.json +++ b/models/apis/redshift/2012-12-01/docs-2.json @@ -178,6 +178,7 @@ "ModifyClusterMessage$AllowVersionUpgrade": "

If true, major version upgrades will be applied automatically to the cluster during the maintenance window.

Default: false

", "ModifyClusterMessage$PubliclyAccessible": "

If true, the cluster can be accessed from a public network. Only clusters in VPCs can be set to be publicly available.

", "ModifyClusterMessage$EnhancedVpcRouting": "

An option that specifies whether to create the cluster with enhanced VPC routing enabled. To create a cluster that uses enhanced VPC routing, the cluster must be in a VPC. For more information, see Enhanced VPC Routing in the Amazon Redshift Cluster Management Guide.

If this option is true, enhanced VPC routing is enabled.

Default: false

", + "ModifyClusterMessage$Encrypted": "

Indicates whether the cluster is encrypted. If the cluster is encrypted and you provide a value for the KmsKeyId parameter, we will encrypt the cluster with the provided KmsKeyId. If you don't provide a KmsKeyId, we will encrypt with the default key. In the China region we will use legacy encryption if you specify that the cluster is encrypted.

", "ModifyEventSubscriptionMessage$Enabled": "

A Boolean value indicating if the subscription is enabled. true indicates the subscription is enabled

", "PendingModifiedValues$PubliclyAccessible": "

The pending or in-progress change of the ability to connect to the cluster from the public network.

", "PendingModifiedValues$EnhancedVpcRouting": "

An option that specifies whether to create the cluster with enhanced VPC routing enabled. To create a cluster that uses enhanced VPC routing, the cluster must be in a VPC. For more information, see Enhanced VPC Routing in the Amazon Redshift Cluster Management Guide.

If this option is true, enhanced VPC routing is enabled.

Default: false

", @@ -1994,6 +1995,7 @@ "ModifyClusterMessage$NewClusterIdentifier": "

The new identifier for the cluster.

Constraints:

Example: examplecluster

", "ModifyClusterMessage$ElasticIp": "

The Elastic IP (EIP) address for the cluster.

Constraints: The cluster must be provisioned in EC2-VPC and publicly-accessible through an Internet gateway. For more information about provisioning clusters in EC2-VPC, go to Supported Platforms to Launch Your Cluster in the Amazon Redshift Cluster Management Guide.

", "ModifyClusterMessage$MaintenanceTrackName": "

The name for the maintenance track that you want to assign for the cluster. This name change is asynchronous. The new track name stays in the PendingModifiedValues for the cluster until the next maintenance window. When the maintenance track changes, the cluster is switched to the latest cluster release available for the maintenance track. At this point, the maintenance track name is applied.

", + "ModifyClusterMessage$KmsKeyId": "

The AWS Key Management Service (KMS) key ID of the encryption key that you want to use to encrypt data in the cluster.

", "ModifyClusterParameterGroupMessage$ParameterGroupName": "

The name of the parameter group to be modified.

", "ModifyClusterSubnetGroupMessage$ClusterSubnetGroupName": "

The name of the subnet group to be modified.

", "ModifyClusterSubnetGroupMessage$Description": "

A text description of the subnet group to be modified.

", @@ -2020,6 +2022,7 @@ "PendingModifiedValues$ClusterVersion": "

The pending or in-progress change of the service version.

", "PendingModifiedValues$ClusterIdentifier": "

The pending or in-progress change of the new identifier for the cluster.

", "PendingModifiedValues$MaintenanceTrackName": "

The name of the maintenance track that the cluster will change to during the next maintenance window.

", + "PendingModifiedValues$EncryptionType": "

The encryption type for a cluster. Possible values are: KMS and None. For the China region the possible values are None, and Legacy.

", "PurchaseReservedNodeOfferingMessage$ReservedNodeOfferingId": "

The unique identifier of the reserved node offering you want to purchase.

", "RebootClusterMessage$ClusterIdentifier": "

The cluster identifier.

", "RecurringCharge$RecurringChargeFrequency": "

The frequency at which the recurring charge amount is applied.

", @@ -2044,6 +2047,7 @@ "ResizeProgressMessage$Status": "

The status of the resize operation.

Valid Values: NONE | IN_PROGRESS | FAILED | SUCCEEDED

", "ResizeProgressMessage$ResizeType": "

An enum with possible values of ClassicResize and ElasticResize. These values describe the type of resize operation being performed.

", "ResizeProgressMessage$Message": "

An optional string to provide additional details about the resize action.

", + "ResizeProgressMessage$TargetEncryptionType": "

The type of encryption for the cluster after the resize is complete.

Possible values are KMS and None. In the China region possible values are: Legacy and None.

", "RestorableNodeTypeList$member": null, "RestoreFromClusterSnapshotMessage$ClusterIdentifier": "

The identifier of the cluster that will be created from restoring the snapshot.

Constraints:

", "RestoreFromClusterSnapshotMessage$SnapshotIdentifier": "

The name of the snapshot from which to create the new cluster. This parameter isn't case sensitive.

Example: my-snapshot-id

", diff --git a/models/endpoints/endpoints.json b/models/endpoints/endpoints.json index fa3346630b..fff5955656 100644 --- a/models/endpoints/endpoints.json +++ b/models/endpoints/endpoints.json @@ -849,6 +849,7 @@ "endpoints" : { "ap-northeast-1" : { }, "ap-northeast-2" : { }, + "ap-southeast-1" : { }, "ap-southeast-2" : { }, "eu-central-1" : { }, "eu-west-1" : { }, @@ -1036,6 +1037,7 @@ "eu-west-1" : { }, "eu-west-2" : { }, "eu-west-3" : { }, + "sa-east-1" : { }, "us-east-1" : { }, "us-east-2" : { }, "us-west-1" : { }, @@ -1719,6 +1721,7 @@ "eu-central-1" : { }, "eu-west-1" : { }, "eu-west-2" : { }, + "eu-west-3" : { }, "sa-east-1" : { }, "us-east-1" : { }, "us-east-1-fips" : { @@ -1820,7 +1823,12 @@ }, "servicediscovery" : { "endpoints" : { + "ap-northeast-1" : { }, + "ap-southeast-1" : { }, + "ap-southeast-2" : { }, + "eu-central-1" : { }, "eu-west-1" : { }, + "eu-west-2" : { }, "us-east-1" : { }, "us-east-2" : { }, "us-west-1" : { }, @@ -2138,8 +2146,26 @@ "endpoints" : { "eu-west-1" : { }, "us-east-1" : { }, + "us-east-1-fips" : { + "credentialScope" : { + "region" : "us-east-1" + }, + "hostname" : "translate-fips.us-east-1.amazonaws.com" + }, "us-east-2" : { }, - "us-west-2" : { } + "us-east-2-fips" : { + "credentialScope" : { + "region" : "us-east-2" + }, + "hostname" : "translate-fips.us-east-2.amazonaws.com" + }, + "us-west-2" : { }, + "us-west-2-fips" : { + "credentialScope" : { + "region" : "us-west-2" + }, + "hostname" : "translate-fips.us-west-2.amazonaws.com" + } } }, "waf" : { @@ -2568,6 +2594,11 @@ "us-gov-west-1" : { } } }, + "application-autoscaling" : { + "endpoints" : { + "us-gov-west-1" : { } + } + }, "autoscaling" : { "endpoints" : { "us-gov-west-1" : { @@ -2879,7 +2910,13 @@ "protocols" : [ "https" ] }, "endpoints" : { - "us-gov-west-1" : { } + "us-gov-west-1" : { }, + "us-gov-west-1-fips" : { + "credentialScope" : { + "region" : "us-gov-west-1" + }, + "hostname" : "translate-fips.us-gov-west-1.amazonaws.com" + } } } } diff --git a/service/cloudhsmv2/api.go b/service/cloudhsmv2/api.go index e2b673426e..9dc9a67e3b 100644 --- a/service/cloudhsmv2/api.go +++ b/service/cloudhsmv2/api.go @@ -55,6 +55,8 @@ func (c *CloudHSMV2) CopyBackupToRegionRequest(input *CopyBackupToRegionInput) ( // CopyBackupToRegion API operation for AWS CloudHSM V2. // +// Copy an AWS CloudHSM cluster backup to a different region. +// // 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. @@ -289,6 +291,101 @@ func (c *CloudHSMV2) CreateHsmWithContext(ctx aws.Context, input *CreateHsmInput return out, req.Send() } +const opDeleteBackup = "DeleteBackup" + +// DeleteBackupRequest generates a "aws/request.Request" representing the +// client's request for the DeleteBackup operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// 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 DeleteBackup for more information on using the DeleteBackup +// 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 DeleteBackupRequest method. +// req, resp := client.DeleteBackupRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/cloudhsmv2-2017-04-28/DeleteBackup +func (c *CloudHSMV2) DeleteBackupRequest(input *DeleteBackupInput) (req *request.Request, output *DeleteBackupOutput) { + op := &request.Operation{ + Name: opDeleteBackup, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &DeleteBackupInput{} + } + + output = &DeleteBackupOutput{} + req = c.newRequest(op, input, output) + return +} + +// DeleteBackup API operation for AWS CloudHSM V2. +// +// Deletes a specified AWS CloudHSM backup. A backup can be restored up to 7 +// days after the DeleteBackup request. For more information on restoring a +// backup, see RestoreBackup +// +// 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 CloudHSM V2's +// API operation DeleteBackup for usage and error information. +// +// Returned Error Codes: +// * ErrCodeCloudHsmInternalFailureException "CloudHsmInternalFailureException" +// The request was rejected because of an AWS CloudHSM internal failure. The +// request can be retried. +// +// * ErrCodeCloudHsmServiceException "CloudHsmServiceException" +// The request was rejected because an error occurred. +// +// * ErrCodeCloudHsmResourceNotFoundException "CloudHsmResourceNotFoundException" +// The request was rejected because it refers to a resource that cannot be found. +// +// * ErrCodeCloudHsmInvalidRequestException "CloudHsmInvalidRequestException" +// The request was rejected because it is not a valid request. +// +// * ErrCodeCloudHsmAccessDeniedException "CloudHsmAccessDeniedException" +// The request was rejected because the requester does not have permission to +// perform the requested operation. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/cloudhsmv2-2017-04-28/DeleteBackup +func (c *CloudHSMV2) DeleteBackup(input *DeleteBackupInput) (*DeleteBackupOutput, error) { + req, out := c.DeleteBackupRequest(input) + return out, req.Send() +} + +// DeleteBackupWithContext is the same as DeleteBackup with the addition of +// the ability to pass a context and additional request options. +// +// See DeleteBackup 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 *CloudHSMV2) DeleteBackupWithContext(ctx aws.Context, input *DeleteBackupInput, opts ...request.Option) (*DeleteBackupOutput, error) { + req, out := c.DeleteBackupRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opDeleteCluster = "DeleteCluster" // DeleteClusterRequest generates a "aws/request.Request" representing the @@ -1040,6 +1137,100 @@ func (c *CloudHSMV2) ListTagsPagesWithContext(ctx aws.Context, input *ListTagsIn return p.Err() } +const opRestoreBackup = "RestoreBackup" + +// RestoreBackupRequest generates a "aws/request.Request" representing the +// client's request for the RestoreBackup operation. The "output" return +// value will be populated with the request's response once the request completes +// successfuly. +// +// 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 RestoreBackup for more information on using the RestoreBackup +// 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 RestoreBackupRequest method. +// req, resp := client.RestoreBackupRequest(params) +// +// err := req.Send() +// if err == nil { // resp is now filled +// fmt.Println(resp) +// } +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/cloudhsmv2-2017-04-28/RestoreBackup +func (c *CloudHSMV2) RestoreBackupRequest(input *RestoreBackupInput) (req *request.Request, output *RestoreBackupOutput) { + op := &request.Operation{ + Name: opRestoreBackup, + HTTPMethod: "POST", + HTTPPath: "/", + } + + if input == nil { + input = &RestoreBackupInput{} + } + + output = &RestoreBackupOutput{} + req = c.newRequest(op, input, output) + return +} + +// RestoreBackup API operation for AWS CloudHSM V2. +// +// Restores a specified AWS CloudHSM backup that is in the PENDING_DELETION +// state. For more information on deleting a backup, see DeleteBackup. +// +// 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 CloudHSM V2's +// API operation RestoreBackup for usage and error information. +// +// Returned Error Codes: +// * ErrCodeCloudHsmInternalFailureException "CloudHsmInternalFailureException" +// The request was rejected because of an AWS CloudHSM internal failure. The +// request can be retried. +// +// * ErrCodeCloudHsmServiceException "CloudHsmServiceException" +// The request was rejected because an error occurred. +// +// * ErrCodeCloudHsmResourceNotFoundException "CloudHsmResourceNotFoundException" +// The request was rejected because it refers to a resource that cannot be found. +// +// * ErrCodeCloudHsmInvalidRequestException "CloudHsmInvalidRequestException" +// The request was rejected because it is not a valid request. +// +// * ErrCodeCloudHsmAccessDeniedException "CloudHsmAccessDeniedException" +// The request was rejected because the requester does not have permission to +// perform the requested operation. +// +// See also, https://docs.aws.amazon.com/goto/WebAPI/cloudhsmv2-2017-04-28/RestoreBackup +func (c *CloudHSMV2) RestoreBackup(input *RestoreBackupInput) (*RestoreBackupOutput, error) { + req, out := c.RestoreBackupRequest(input) + return out, req.Send() +} + +// RestoreBackupWithContext is the same as RestoreBackup with the addition of +// the ability to pass a context and additional request options. +// +// See RestoreBackup 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 *CloudHSMV2) RestoreBackupWithContext(ctx aws.Context, input *RestoreBackupInput, opts ...request.Option) (*RestoreBackupOutput, error) { + req, out := c.RestoreBackupRequest(input) + req.SetContext(ctx) + req.ApplyOptions(opts...) + return out, req.Send() +} + const opTagResource = "TagResource" // TagResourceRequest generates a "aws/request.Request" representing the @@ -1246,6 +1437,9 @@ type Backup struct { // The date and time when the backup was created. CreateTimestamp *time.Time `type:"timestamp"` + // The date and time when the backup will be permanently deleted. + DeleteTimestamp *time.Time `type:"timestamp"` + SourceBackup *string `type:"string"` SourceCluster *string `type:"string"` @@ -1293,6 +1487,12 @@ func (s *Backup) SetCreateTimestamp(v time.Time) *Backup { return s } +// SetDeleteTimestamp sets the DeleteTimestamp field's value. +func (s *Backup) SetDeleteTimestamp(v time.Time) *Backup { + s.DeleteTimestamp = &v + return s +} + // SetSourceBackup sets the SourceBackup field's value. func (s *Backup) SetSourceBackup(v string) *Backup { s.SourceBackup = &v @@ -1510,9 +1710,13 @@ func (s *Cluster) SetVpcId(v string) *Cluster { type CopyBackupToRegionInput struct { _ struct{} `type:"structure"` + // The ID of the backup that will be copied to the destination region. + // // BackupId is a required field BackupId *string `type:"string" required:"true"` + // The AWS region that will contain your copied CloudHSM cluster backup. + // // DestinationRegion is a required field DestinationRegion *string `type:"string" required:"true"` } @@ -1558,6 +1762,14 @@ func (s *CopyBackupToRegionInput) SetDestinationRegion(v string) *CopyBackupToRe type CopyBackupToRegionOutput struct { _ struct{} `type:"structure"` + // Information on the backup that will be copied to the destination region, + // including CreateTimestamp, SourceBackup, SourceCluster, and Source Region. + // CreateTimestamp of the destination backup will be the same as that of the + // source backup. + // + // You will need to use the sourceBackupID returned in this operation to use + // the DescribeBackups operation on the backup that will be copied to the destination + // region. DestinationBackup *DestinationBackup `type:"structure"` } @@ -1761,6 +1973,68 @@ func (s *CreateHsmOutput) SetHsm(v *Hsm) *CreateHsmOutput { return s } +type DeleteBackupInput struct { + _ struct{} `type:"structure"` + + // The ID of the backup to be deleted. To find the ID of a backup, use the DescribeBackups + // operation. + // + // BackupId is a required field + BackupId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s DeleteBackupInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteBackupInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *DeleteBackupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "DeleteBackupInput"} + if s.BackupId == nil { + invalidParams.Add(request.NewErrParamRequired("BackupId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetBackupId sets the BackupId field's value. +func (s *DeleteBackupInput) SetBackupId(v string) *DeleteBackupInput { + s.BackupId = &v + return s +} + +type DeleteBackupOutput struct { + _ struct{} `type:"structure"` + + // Information on the Backup object deleted. + Backup *Backup `type:"structure"` +} + +// String returns the string representation +func (s DeleteBackupOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s DeleteBackupOutput) GoString() string { + return s.String() +} + +// SetBackup sets the Backup field's value. +func (s *DeleteBackupOutput) SetBackup(v *Backup) *DeleteBackupOutput { + s.Backup = v + return s +} + type DeleteClusterInput struct { _ struct{} `type:"structure"` @@ -1921,6 +2195,10 @@ type DescribeBackupsInput struct { // Use the backupIds filter to return only the specified backups. Specify backups // by their backup identifier (ID). // + // Use the sourceBackupIds filter to return only the backups created from a + // source backup. The sourceBackupID of a source backup is returned by the CopyBackupToRegion + // operation. + // // Use the clusterIds filter to return only the backups for the specified clusters. // Specify clusters by their cluster identifier (ID). // @@ -2456,6 +2734,68 @@ func (s *ListTagsOutput) SetTagList(v []*Tag) *ListTagsOutput { return s } +type RestoreBackupInput struct { + _ struct{} `type:"structure"` + + // The ID of the backup to be restored. To find the ID of a backup, use the + // DescribeBackups operation. + // + // BackupId is a required field + BackupId *string `type:"string" required:"true"` +} + +// String returns the string representation +func (s RestoreBackupInput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RestoreBackupInput) GoString() string { + return s.String() +} + +// Validate inspects the fields of the type to determine if they are valid. +func (s *RestoreBackupInput) Validate() error { + invalidParams := request.ErrInvalidParams{Context: "RestoreBackupInput"} + if s.BackupId == nil { + invalidParams.Add(request.NewErrParamRequired("BackupId")) + } + + if invalidParams.Len() > 0 { + return invalidParams + } + return nil +} + +// SetBackupId sets the BackupId field's value. +func (s *RestoreBackupInput) SetBackupId(v string) *RestoreBackupInput { + s.BackupId = &v + return s +} + +type RestoreBackupOutput struct { + _ struct{} `type:"structure"` + + // Information on the Backup object created. + Backup *Backup `type:"structure"` +} + +// String returns the string representation +func (s RestoreBackupOutput) String() string { + return awsutil.Prettify(s) +} + +// GoString returns the string representation +func (s RestoreBackupOutput) GoString() string { + return s.String() +} + +// SetBackup sets the Backup field's value. +func (s *RestoreBackupOutput) SetBackup(v *Backup) *RestoreBackupOutput { + s.Backup = v + return s +} + // Contains a tag. A tag is a key-value pair. type Tag struct { _ struct{} `type:"structure"` @@ -2677,6 +3017,9 @@ const ( // BackupStateDeleted is a BackupState enum value BackupStateDeleted = "DELETED" + + // BackupStatePendingDeletion is a BackupState enum value + BackupStatePendingDeletion = "PENDING_DELETION" ) const ( diff --git a/service/cloudhsmv2/cloudhsmv2iface/interface.go b/service/cloudhsmv2/cloudhsmv2iface/interface.go index 20b5b996c8..abc7885ebd 100644 --- a/service/cloudhsmv2/cloudhsmv2iface/interface.go +++ b/service/cloudhsmv2/cloudhsmv2iface/interface.go @@ -72,6 +72,10 @@ type CloudHSMV2API interface { CreateHsmWithContext(aws.Context, *cloudhsmv2.CreateHsmInput, ...request.Option) (*cloudhsmv2.CreateHsmOutput, error) CreateHsmRequest(*cloudhsmv2.CreateHsmInput) (*request.Request, *cloudhsmv2.CreateHsmOutput) + DeleteBackup(*cloudhsmv2.DeleteBackupInput) (*cloudhsmv2.DeleteBackupOutput, error) + DeleteBackupWithContext(aws.Context, *cloudhsmv2.DeleteBackupInput, ...request.Option) (*cloudhsmv2.DeleteBackupOutput, error) + DeleteBackupRequest(*cloudhsmv2.DeleteBackupInput) (*request.Request, *cloudhsmv2.DeleteBackupOutput) + DeleteCluster(*cloudhsmv2.DeleteClusterInput) (*cloudhsmv2.DeleteClusterOutput, error) DeleteClusterWithContext(aws.Context, *cloudhsmv2.DeleteClusterInput, ...request.Option) (*cloudhsmv2.DeleteClusterOutput, error) DeleteClusterRequest(*cloudhsmv2.DeleteClusterInput) (*request.Request, *cloudhsmv2.DeleteClusterOutput) @@ -105,6 +109,10 @@ type CloudHSMV2API interface { ListTagsPages(*cloudhsmv2.ListTagsInput, func(*cloudhsmv2.ListTagsOutput, bool) bool) error ListTagsPagesWithContext(aws.Context, *cloudhsmv2.ListTagsInput, func(*cloudhsmv2.ListTagsOutput, bool) bool, ...request.Option) error + RestoreBackup(*cloudhsmv2.RestoreBackupInput) (*cloudhsmv2.RestoreBackupOutput, error) + RestoreBackupWithContext(aws.Context, *cloudhsmv2.RestoreBackupInput, ...request.Option) (*cloudhsmv2.RestoreBackupOutput, error) + RestoreBackupRequest(*cloudhsmv2.RestoreBackupInput) (*request.Request, *cloudhsmv2.RestoreBackupOutput) + TagResource(*cloudhsmv2.TagResourceInput) (*cloudhsmv2.TagResourceOutput, error) TagResourceWithContext(aws.Context, *cloudhsmv2.TagResourceInput, ...request.Option) (*cloudhsmv2.TagResourceOutput, error) TagResourceRequest(*cloudhsmv2.TagResourceInput) (*request.Request, *cloudhsmv2.TagResourceOutput) diff --git a/service/redshift/api.go b/service/redshift/api.go index abf5b5076c..c57085cf46 100644 --- a/service/redshift/api.go +++ b/service/redshift/api.go @@ -13264,6 +13264,12 @@ type DescribeResizeOutput struct { // Valid Values: multi-node | single-node TargetClusterType *string `type:"string"` + // The type of encryption for the cluster after the resize is complete. + // + // Possible values are KMS and None. In the China region possible values are: + // Legacy and None. + TargetEncryptionType *string `type:"string"` + // The node type that the cluster will have after the resize operation is complete. TargetNodeType *string `type:"string"` @@ -13352,6 +13358,12 @@ func (s *DescribeResizeOutput) SetTargetClusterType(v string) *DescribeResizeOut return s } +// SetTargetEncryptionType sets the TargetEncryptionType field's value. +func (s *DescribeResizeOutput) SetTargetEncryptionType(v string) *DescribeResizeOutput { + s.TargetEncryptionType = &v + return s +} + // SetTargetNodeType sets the TargetNodeType field's value. func (s *DescribeResizeOutput) SetTargetNodeType(v string) *DescribeResizeOutput { s.TargetNodeType = &v @@ -15304,6 +15316,13 @@ type ModifyClusterInput struct { // in the Amazon Redshift Cluster Management Guide. ElasticIp *string `type:"string"` + // Indicates whether the cluster is encrypted. If the cluster is encrypted and + // you provide a value for the KmsKeyId parameter, we will encrypt the cluster + // with the provided KmsKeyId. If you don't provide a KmsKeyId, we will encrypt + // with the default key. In the China region we will use legacy encryption if + // you specify that the cluster is encrypted. + Encrypted *bool `type:"boolean"` + // An option that specifies whether to create the cluster with enhanced VPC // routing enabled. To create a cluster that uses enhanced VPC routing, the // cluster must be in a VPC. For more information, see Enhanced VPC Routing @@ -15323,6 +15342,10 @@ type ModifyClusterInput struct { // the Amazon Redshift cluster can use to retrieve and store keys in an HSM. HsmConfigurationIdentifier *string `type:"string"` + // The AWS Key Management Service (KMS) key ID of the encryption key that you + // want to use to encrypt data in the cluster. + KmsKeyId *string `type:"string"` + // The name for the maintenance track that you want to assign for the cluster. // This name change is asynchronous. The new track name stays in the PendingModifiedValues // for the cluster until the next maintenance window. When the maintenance track @@ -15499,6 +15522,12 @@ func (s *ModifyClusterInput) SetElasticIp(v string) *ModifyClusterInput { return s } +// SetEncrypted sets the Encrypted field's value. +func (s *ModifyClusterInput) SetEncrypted(v bool) *ModifyClusterInput { + s.Encrypted = &v + return s +} + // SetEnhancedVpcRouting sets the EnhancedVpcRouting field's value. func (s *ModifyClusterInput) SetEnhancedVpcRouting(v bool) *ModifyClusterInput { s.EnhancedVpcRouting = &v @@ -15517,6 +15546,12 @@ func (s *ModifyClusterInput) SetHsmConfigurationIdentifier(v string) *ModifyClus return s } +// SetKmsKeyId sets the KmsKeyId field's value. +func (s *ModifyClusterInput) SetKmsKeyId(v string) *ModifyClusterInput { + s.KmsKeyId = &v + return s +} + // SetMaintenanceTrackName sets the MaintenanceTrackName field's value. func (s *ModifyClusterInput) SetMaintenanceTrackName(v string) *ModifyClusterInput { s.MaintenanceTrackName = &v @@ -16127,6 +16162,10 @@ type PendingModifiedValues struct { // The pending or in-progress change of the service version. ClusterVersion *string `type:"string"` + // The encryption type for a cluster. Possible values are: KMS and None. For + // the China region the possible values are None, and Legacy. + EncryptionType *string `type:"string"` + // An option that specifies whether to create the cluster with enhanced VPC // routing enabled. To create a cluster that uses enhanced VPC routing, the // cluster must be in a VPC. For more information, see Enhanced VPC Routing @@ -16190,6 +16229,12 @@ func (s *PendingModifiedValues) SetClusterVersion(v string) *PendingModifiedValu return s } +// SetEncryptionType sets the EncryptionType field's value. +func (s *PendingModifiedValues) SetEncryptionType(v string) *PendingModifiedValues { + s.EncryptionType = &v + return s +} + // SetEnhancedVpcRouting sets the EnhancedVpcRouting field's value. func (s *PendingModifiedValues) SetEnhancedVpcRouting(v bool) *PendingModifiedValues { s.EnhancedVpcRouting = &v