Merge branch 'release-1.12.1'

* release-1.12.1: Bumping version to 1.12.1 Update to latest endpoints Update to latest models
boto · Sep 10, 2018 · 238383c · 238383c
2 parents 2acf6a4 + 97528f9
commit 238383c
Show file tree

Hide file tree

Showing 7 changed files with 170 additions and 11 deletions.
diff --git a/.changes/1.12.1.json b/.changes/1.12.1.json
@@ -0,0 +1,12 @@
+[
+  {
+    "category": "``redshift``", 
+    "description": "Update redshift client to latest version", 
+    "type": "api-change"
+  }, 
+  {
+    "category": "``cloudhsmv2``", 
+    "description": "Update cloudhsmv2 client to latest version", 
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+1.12.1
+======
+
+* api-change:``redshift``: Update redshift client to latest version
+* api-change:``cloudhsmv2``: Update cloudhsmv2 client to latest version
+
+
 1.12.0
 ======
 

diff --git a/botocore/__init__.py b/botocore/__init__.py
@@ -16,7 +16,7 @@
 import re
 import logging
 
-__version__ = '1.12.0'
+__version__ = '1.12.1'
 
 
 class NullHandler(logging.Handler):

diff --git a/botocore/data/cloudhsmv2/2017-04-28/service-2.json b/botocore/data/cloudhsmv2/2017-04-28/service-2.json
@@ -28,7 +28,8 @@
         {"shape":"CloudHsmResourceNotFoundException"},
         {"shape":"CloudHsmInvalidRequestException"},
         {"shape":"CloudHsmAccessDeniedException"}
-      ]
+      ],
+      "documentation":"<p>Copy an AWS CloudHSM cluster backup to a different region.</p>"
     },
     "CreateCluster":{
       "name":"CreateCluster",
@@ -64,6 +65,23 @@
       ],
       "documentation":"<p>Creates a new hardware security module (HSM) in the specified AWS CloudHSM cluster.</p>"
     },
+    "DeleteBackup":{
+      "name":"DeleteBackup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteBackupRequest"},
+      "output":{"shape":"DeleteBackupResponse"},
+      "errors":[
+        {"shape":"CloudHsmInternalFailureException"},
+        {"shape":"CloudHsmServiceException"},
+        {"shape":"CloudHsmResourceNotFoundException"},
+        {"shape":"CloudHsmInvalidRequestException"},
+        {"shape":"CloudHsmAccessDeniedException"}
+      ],
+      "documentation":"<p>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 <a>RestoreBackup</a> </p>"
+    },
     "DeleteCluster":{
       "name":"DeleteCluster",
       "http":{
@@ -165,6 +183,23 @@
       ],
       "documentation":"<p>Gets a list of tags for the specified AWS CloudHSM cluster.</p> <p>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 <code>NextToken</code> value. Use this value in a subsequent <code>ListTags</code> request to get more tags. When you receive a response with no <code>NextToken</code> (or an empty or null value), that means there are no more tags to get.</p>"
     },
+    "RestoreBackup":{
+      "name":"RestoreBackup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"RestoreBackupRequest"},
+      "output":{"shape":"RestoreBackupResponse"},
+      "errors":[
+        {"shape":"CloudHsmInternalFailureException"},
+        {"shape":"CloudHsmServiceException"},
+        {"shape":"CloudHsmResourceNotFoundException"},
+        {"shape":"CloudHsmInvalidRequestException"},
+        {"shape":"CloudHsmAccessDeniedException"}
+      ],
+      "documentation":"<p>Restores a specified AWS CloudHSM backup that is in the <code>PENDING_DELETION</code> state. For more information on deleting a backup, see <a>DeleteBackup</a>.</p>"
+    },
     "TagResource":{
       "name":"TagResource",
       "http":{
@@ -224,7 +259,11 @@
         "CopyTimestamp":{"shape":"Timestamp"},
         "SourceRegion":{"shape":"Region"},
         "SourceBackup":{"shape":"BackupId"},
-        "SourceCluster":{"shape":"ClusterId"}
+        "SourceCluster":{"shape":"ClusterId"},
+        "DeleteTimestamp":{
+          "shape":"Timestamp",
+          "documentation":"<p>The date and time when the backup will be permanently deleted.</p>"
+        }
       },
       "documentation":"<p>Contains information about a backup of an AWS CloudHSM cluster.</p>"
     },
@@ -241,7 +280,8 @@
       "enum":[
         "CREATE_IN_PROGRESS",
         "READY",
-        "DELETED"
+        "DELETED",
+        "PENDING_DELETION"
       ]
     },
     "Backups":{
@@ -408,14 +448,23 @@
         "BackupId"
       ],
       "members":{
-        "DestinationRegion":{"shape":"Region"},
-        "BackupId":{"shape":"BackupId"}
+        "DestinationRegion":{
+          "shape":"Region",
+          "documentation":"<p>The AWS region that will contain your copied CloudHSM cluster backup.</p>"
+        },
+        "BackupId":{
+          "shape":"BackupId",
+          "documentation":"<p>The ID of the backup that will be copied to the destination region. </p>"
+        }
       }
     },
     "CopyBackupToRegionResponse":{
       "type":"structure",
       "members":{
-        "DestinationBackup":{"shape":"DestinationBackup"}
+        "DestinationBackup":{
+          "shape":"DestinationBackup",
+          "documentation":"<p>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.</p> <p>You will need to use the <code>sourceBackupID</code> returned in this operation to use the <a>DescribeBackups</a> operation on the backup that will be copied to the destination region.</p>"
+        }
       }
     },
     "CreateClusterRequest":{
@@ -478,6 +527,25 @@
         }
       }
     },
+    "DeleteBackupRequest":{
+      "type":"structure",
+      "required":["BackupId"],
+      "members":{
+        "BackupId":{
+          "shape":"BackupId",
+          "documentation":"<p>The ID of the backup to be deleted. To find the ID of a backup, use the <a>DescribeBackups</a> operation.</p>"
+        }
+      }
+    },
+    "DeleteBackupResponse":{
+      "type":"structure",
+      "members":{
+        "Backup":{
+          "shape":"Backup",
+          "documentation":"<p>Information on the <code>Backup</code> object deleted.</p>"
+        }
+      }
+    },
     "DeleteClusterRequest":{
       "type":"structure",
       "required":["ClusterId"],
@@ -541,7 +609,7 @@
         },
         "Filters":{
           "shape":"Filters",
-          "documentation":"<p>One or more filters to limit the items returned in the response.</p> <p>Use the <code>backupIds</code> filter to return only the specified backups. Specify backups by their backup identifier (ID).</p> <p>Use the <code>clusterIds</code> filter to return only the backups for the specified clusters. Specify clusters by their cluster identifier (ID).</p> <p>Use the <code>states</code> filter to return only backups that match the specified state.</p>"
+          "documentation":"<p>One or more filters to limit the items returned in the response.</p> <p>Use the <code>backupIds</code> filter to return only the specified backups. Specify backups by their backup identifier (ID).</p> <p>Use the <code>sourceBackupIds</code> filter to return only the backups created from a source backup. The <code>sourceBackupID</code> of a source backup is returned by the <a>CopyBackupToRegion</a> operation.</p> <p>Use the <code>clusterIds</code> filter to return only the backups for the specified clusters. Specify clusters by their cluster identifier (ID).</p> <p>Use the <code>states</code> filter to return only backups that match the specified state.</p>"
         },
         "SortAscending":{"shape":"Boolean"}
       }
@@ -771,6 +839,25 @@
       "type":"string",
       "pattern":"[a-z]{2}(-(gov))?-(east|west|north|south|central){1,2}-\\d"
     },
+    "RestoreBackupRequest":{
+      "type":"structure",
+      "required":["BackupId"],
+      "members":{
+        "BackupId":{
+          "shape":"BackupId",
+          "documentation":"<p>The ID of the backup to be restored. To find the ID of a backup, use the <a>DescribeBackups</a> operation.</p>"
+        }
+      }
+    },
+    "RestoreBackupResponse":{
+      "type":"structure",
+      "members":{
+        "Backup":{
+          "shape":"Backup",
+          "documentation":"<p>Information on the <code>Backup</code> object created.</p>"
+        }
+      }
+    },
     "SecurityGroup":{
       "type":"string",
       "pattern":"sg-[0-9a-fA-F]"

diff --git a/botocore/data/endpoints.json b/botocore/data/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/botocore/data/redshift/2012-12-01/service-2.json b/botocore/data/redshift/2012-12-01/service-2.json
@@ -4540,6 +4540,14 @@
         "MaintenanceTrackName":{
           "shape":"String",
           "documentation":"<p>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 <code>PendingModifiedValues</code> 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.</p>"
+        },
+        "Encrypted":{
+          "shape":"BooleanOptional",
+          "documentation":"<p>Indicates whether the cluster is encrypted. If the cluster is encrypted and you provide a value for the <code>KmsKeyId</code> parameter, we will encrypt the cluster with the provided <code>KmsKeyId</code>. If you don't provide a <code>KmsKeyId</code>, we will encrypt with the default key. In the China region we will use legacy encryption if you specify that the cluster is encrypted.</p>"
+        },
+        "KmsKeyId":{
+          "shape":"String",
+          "documentation":"<p>The AWS Key Management Service (KMS) key ID of the encryption key that you want to use to encrypt data in the cluster.</p>"
         }
       },
       "documentation":"<p/>"
@@ -4838,6 +4846,10 @@
         "MaintenanceTrackName":{
           "shape":"String",
           "documentation":"<p>The name of the maintenance track that the cluster will change to during the next maintenance window.</p>"
+        },
+        "EncryptionType":{
+          "shape":"String",
+          "documentation":"<p>The encryption type for a cluster. Possible values are: KMS and None. For the China region the possible values are None, and Legacy. </p>"
         }
       },
       "documentation":"<p>Describes cluster attributes that are in a pending state. A change to one or more the attributes was requested and is in progress or will be applied.</p>"
@@ -5231,6 +5243,10 @@
         "Message":{
           "shape":"String",
           "documentation":"<p>An optional string to provide additional details about the resize action.</p>"
+        },
+        "TargetEncryptionType":{
+          "shape":"String",
+          "documentation":"<p>The type of encryption for the cluster after the resize is complete.</p> <p>Possible values are <code>KMS</code> and <code>None</code>. In the China region possible values are: <code>Legacy</code> and <code>None</code>.</p>"
         }
       },
       "documentation":"<p>Describes the result of a cluster resize operation.</p>"

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -54,7 +54,7 @@
 # The short X.Y version.
 version = '1.12'
 # The full version, including alpha/beta/rc tags.
-release = '1.12.0'
+release = '1.12.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.