Merge branch 'release-1.35.94' into develop

* release-1.35.94:
  Bumping version to 1.35.94
  Update endpoints model
  Update to latest models

.changes/1.35.94.json

@@ -0,0 +1,17 @@
+[
+  {
+    "category": "``cloudhsmv2``",
+    "description": "Adds support to ModifyCluster for modifying a Cluster's Hsm Type.",
+    "type": "api-change"
+  },
+  {
+    "category": "``dynamodb``",
+    "description": "This release makes Amazon DynamoDB point-in-time-recovery (PITR) to be configurable. You can set PITR recovery period for each table individually to between 1 and 35 days.",
+    "type": "api-change"
+  },
+  {
+    "category": "``imagebuilder``",
+    "description": "This release adds support for importing images from ISO disk files. Added new ImportDiskImage API operation.",
+    "type": "api-change"
+  }
+]

CHANGELOG.rst

@@ -2,6 +2,14 @@
 CHANGELOG
 =========
 
+1.35.94
+=======
+
+* api-change:``cloudhsmv2``: Adds support to ModifyCluster for modifying a Cluster's Hsm Type.
+* api-change:``dynamodb``: This release makes Amazon DynamoDB point-in-time-recovery (PITR) to be configurable. You can set PITR recovery period for each table individually to between 1 and 35 days.
+* api-change:``imagebuilder``: This release adds support for importing images from ISO disk files. Added new ImportDiskImage API operation.
+
+
 1.35.93
 =======
 

botocore/__init__.py

@@ -16,7 +16,7 @@
 import os
 import re
 
-__version__ = '1.35.93'
+__version__ = '1.35.94'
 
 
 class NullHandler(logging.Handler):

botocore/data/cloudhsmv2/2017-04-28/service-2.json

@@ -569,6 +569,10 @@
           "shape":"HsmType",
           "documentation":"<p>The type of HSM that the cluster contains.</p>"
         },
+        "HsmTypeRollbackExpiration":{
+          "shape":"Timestamp",
+          "documentation":"<p>The timestamp until when the cluster can be rolled back to its original HSM type.</p>"
+        },
         "PreCoPassword":{
           "shape":"PreCoPassword",
           "documentation":"<p>The default password for the cluster's Pre-Crypto Officer (PRECO) user.</p>"
@@ -599,7 +603,7 @@
         },
         "NetworkType":{
           "shape":"NetworkType",
-          "documentation":"<p>The cluster's NetworkType can be set to either IPV4 (which is the default) or DUALSTACK. When set to IPV4, communication between your application and the Hardware Security Modules (HSMs) is restricted to the IPv4 protocol only. In contrast, the DUALSTACK network type enables communication over both the IPv4 and IPv6 protocols. To use the DUALSTACK option, you'll need to configure your Virtual Private Cloud (VPC) and subnets to support both IPv4 and IPv6. This involves adding IPv6 Classless Inter-Domain Routing (CIDR) blocks to the existing IPv4 CIDR blocks in your subnets. The choice between IPV4 and DUALSTACK network types determines the flexibility of the network addressing setup for your cluster. The DUALSTACK option provides more flexibility by allowing both IPv4 and IPv6 communication.</p>"
+          "documentation":"<p>The cluster's NetworkType can be IPv4 (the default) or DUALSTACK. The IPv4 NetworkType restricts communication between your application and the hardware security modules (HSMs) to the IPv4 protocol only. The DUALSTACK NetworkType enables communication over both IPv4 and IPv6 protocols. To use DUALSTACK, configure your virtual private cloud (VPC) and subnets to support both IPv4 and IPv6. This configuration involves adding IPv6 Classless Inter-Domain Routing (CIDR) blocks to the existing IPv4 CIDR blocks in your subnets. The NetworkType you choose affects the network addressing options for your cluster. DUALSTACK provides more flexibility by supporting both IPv4 and IPv6 communication.</p>"
         },
         "Certificates":{
           "shape":"Certificates",
@@ -1012,6 +1016,10 @@
           "shape":"HsmId",
           "documentation":"<p>The HSM's identifier (ID).</p>"
         },
+        "HsmType":{
+          "shape":"HsmType",
+          "documentation":"<p>The type of HSM.</p>"
+        },
         "State":{
           "shape":"HsmState",
           "documentation":"<p>The HSM's state.</p>"
@@ -1151,11 +1159,12 @@
     },
     "ModifyClusterRequest":{
       "type":"structure",
-      "required":[
-        "BackupRetentionPolicy",
-        "ClusterId"
-      ],
+      "required":["ClusterId"],
       "members":{
+        "HsmType":{
+          "shape":"HsmType",
+          "documentation":"<p>The desired HSM type of the cluster.</p>"
+        },
         "BackupRetentionPolicy":{
           "shape":"BackupRetentionPolicy",
           "documentation":"<p>A policy that defines how the service retains backups.</p>"

botocore/data/dynamodb/2012-08-10/endpoint-rule-set-1.json

@@ -170,9 +170,9 @@
                                         "properties": {
                                             "authSchemes": [
                                                 {
-                                                    "signingRegion": "us-east-1",
+                                                    "name": "sigv4",
                                                     "signingName": "dynamodb",
-                                                    "name": "sigv4"
+                                                    "signingRegion": "us-east-1"
                                                 }
                                             ]
                                         },

botocore/data/dynamodb/2012-08-10/service-2.json

@@ -226,7 +226,7 @@
         {"shape":"TableNotFoundException"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Checks the status of continuous backups and point in time recovery on the specified table. Continuous backups are <code>ENABLED</code> on all tables at table creation. If point in time recovery is enabled, <code>PointInTimeRecoveryStatus</code> will be set to ENABLED.</p> <p> After continuous backups and point in time recovery are enabled, you can restore to any point in time within <code>EarliestRestorableDateTime</code> and <code>LatestRestorableDateTime</code>. </p> <p> <code>LatestRestorableDateTime</code> is typically 5 minutes before the current time. You can restore your table to any point in time during the last 35 days. </p> <p>You can call <code>DescribeContinuousBackups</code> at a maximum rate of 10 times per second.</p>",
+      "documentation":"<p>Checks the status of continuous backups and point in time recovery on the specified table. Continuous backups are <code>ENABLED</code> on all tables at table creation. If point in time recovery is enabled, <code>PointInTimeRecoveryStatus</code> will be set to ENABLED.</p> <p> After continuous backups and point in time recovery are enabled, you can restore to any point in time within <code>EarliestRestorableDateTime</code> and <code>LatestRestorableDateTime</code>. </p> <p> <code>LatestRestorableDateTime</code> is typically 5 minutes before the current time. You can restore your table to any point in time in the last 35 days. You can set the recovery period to any value between 1 and 35 days. </p> <p>You can call <code>DescribeContinuousBackups</code> at a maximum rate of 10 times per second.</p>",
       "endpointdiscovery":{
       }
     },
@@ -733,7 +733,7 @@
         {"shape":"PointInTimeRecoveryUnavailableException"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p>Restores the specified table to the specified point in time within <code>EarliestRestorableDateTime</code> and <code>LatestRestorableDateTime</code>. You can restore your table to any point in time during the last 35 days. Any number of users can execute up to 50 concurrent restores (any type of restore) in a given account. </p> <p>When you restore using point in time recovery, DynamoDB restores your table data to the state based on the selected date and time (day:hour:minute:second) to a new table. </p> <p>Along with data, the following are also included on the new restored table using point in time recovery: </p> <ul> <li> <p>Global secondary indexes (GSIs)</p> </li> <li> <p>Local secondary indexes (LSIs)</p> </li> <li> <p>Provisioned read and write capacity</p> </li> <li> <p>Encryption settings</p> <important> <p> All these settings come from the current settings of the source table at the time of restore. </p> </important> </li> </ul> <p>You must manually set up the following on the restored table:</p> <ul> <li> <p>Auto scaling policies</p> </li> <li> <p>IAM policies</p> </li> <li> <p>Amazon CloudWatch metrics and alarms</p> </li> <li> <p>Tags</p> </li> <li> <p>Stream settings</p> </li> <li> <p>Time to Live (TTL) settings</p> </li> <li> <p>Point in time recovery settings</p> </li> </ul>",
+      "documentation":"<p>Restores the specified table to the specified point in time within <code>EarliestRestorableDateTime</code> and <code>LatestRestorableDateTime</code>. You can restore your table to any point in time in the last 35 days. You can set the recovery period to any value between 1 and 35 days. Any number of users can execute up to 50 concurrent restores (any type of restore) in a given account. </p> <p>When you restore using point in time recovery, DynamoDB restores your table data to the state based on the selected date and time (day:hour:minute:second) to a new table. </p> <p>Along with data, the following are also included on the new restored table using point in time recovery: </p> <ul> <li> <p>Global secondary indexes (GSIs)</p> </li> <li> <p>Local secondary indexes (LSIs)</p> </li> <li> <p>Provisioned read and write capacity</p> </li> <li> <p>Encryption settings</p> <important> <p> All these settings come from the current settings of the source table at the time of restore. </p> </important> </li> </ul> <p>You must manually set up the following on the restored table:</p> <ul> <li> <p>Auto scaling policies</p> </li> <li> <p>IAM policies</p> </li> <li> <p>Amazon CloudWatch metrics and alarms</p> </li> <li> <p>Tags</p> </li> <li> <p>Stream settings</p> </li> <li> <p>Time to Live (TTL) settings</p> </li> <li> <p>Point in time recovery settings</p> </li> </ul>",
       "endpointdiscovery":{
       }
     },
@@ -842,7 +842,7 @@
         {"shape":"ContinuousBackupsUnavailableException"},
         {"shape":"InternalServerError"}
       ],
-      "documentation":"<p> <code>UpdateContinuousBackups</code> enables or disables point in time recovery for the specified table. A successful <code>UpdateContinuousBackups</code> call returns the current <code>ContinuousBackupsDescription</code>. Continuous backups are <code>ENABLED</code> on all tables at table creation. If point in time recovery is enabled, <code>PointInTimeRecoveryStatus</code> will be set to ENABLED.</p> <p> Once continuous backups and point in time recovery are enabled, you can restore to any point in time within <code>EarliestRestorableDateTime</code> and <code>LatestRestorableDateTime</code>. </p> <p> <code>LatestRestorableDateTime</code> is typically 5 minutes before the current time. You can restore your table to any point in time during the last 35 days. </p>",
+      "documentation":"<p> <code>UpdateContinuousBackups</code> enables or disables point in time recovery for the specified table. A successful <code>UpdateContinuousBackups</code> call returns the current <code>ContinuousBackupsDescription</code>. Continuous backups are <code>ENABLED</code> on all tables at table creation. If point in time recovery is enabled, <code>PointInTimeRecoveryStatus</code> will be set to ENABLED.</p> <p> Once continuous backups and point in time recovery are enabled, you can restore to any point in time within <code>EarliestRestorableDateTime</code> and <code>LatestRestorableDateTime</code>. </p> <p> <code>LatestRestorableDateTime</code> is typically 5 minutes before the current time. You can restore your table to any point in time in the last 35 days. You can set the recovery period to any value between 1 and 35 days.</p>",
       "endpointdiscovery":{
       }
     },
@@ -4451,6 +4451,10 @@
           "shape":"PointInTimeRecoveryStatus",
           "documentation":"<p>The current state of point in time recovery:</p> <ul> <li> <p> <code>ENABLED</code> - Point in time recovery is enabled.</p> </li> <li> <p> <code>DISABLED</code> - Point in time recovery is disabled.</p> </li> </ul>"
         },
+        "RecoveryPeriodInDays":{
+          "shape":"RecoveryPeriodInDays",
+          "documentation":"<p>The number of preceding days for which continuous backups are taken and maintained. Your table data is only recoverable to any point-in-time from within the configured recovery period. This parameter is optional. If no value is provided, the value will default to 35.</p>"
+        },
         "EarliestRestorableDateTime":{
           "shape":"Date",
           "documentation":"<p>Specifies the earliest point in time you can restore your table to. You can restore your table to any point in time during the last 35 days. </p>"
@@ -4469,6 +4473,10 @@
         "PointInTimeRecoveryEnabled":{
           "shape":"BooleanObject",
           "documentation":"<p>Indicates whether point in time recovery is enabled (true) or disabled (false) on the table.</p>"
+        },
+        "RecoveryPeriodInDays":{
+          "shape":"RecoveryPeriodInDays",
+          "documentation":"<p>The number of preceding days for which continuous backups are taken and maintained. Your table data is only recoverable to any point-in-time from within the configured recovery period. This parameter is optional. If no value is provided, the value will default to 35.</p>"
         }
       },
       "documentation":"<p>Represents the settings used to enable point in time recovery.</p>"
@@ -4857,6 +4865,11 @@
       },
       "documentation":"<p>Represents the output of a <code>Query</code> operation.</p>"
     },
+    "RecoveryPeriodInDays":{
+      "type":"integer",
+      "max":35,
+      "min":1
+    },
     "RegionName":{"type":"string"},
     "Replica":{
       "type":"structure",

botocore/data/endpoints.json

@@ -33916,4 +33916,4 @@
     "services" : { }
   } ],
   "version" : 3
-}
+}