Merge branch 'release-1.33.1'

* release-1.33.1: Bumping version to 1.33.1 Update to latest partitions and endpoints Update to latest models
boto · Nov 28, 2023 · 9651c2d · 9651c2d
2 parents 4b7d82f + 86c8505
commit 9651c2d
Show file tree

Hide file tree

Showing 8 changed files with 908 additions and 35 deletions.
diff --git a/.changes/1.33.1.json b/.changes/1.33.1.json
@@ -0,0 +1,7 @@
+[
+  {
+    "category": "``elasticache``",
+    "description": "Launching Amazon ElastiCache Serverless that enables you to create a cache in under a minute without any capacity management. ElastiCache Serverless monitors the cache's memory, CPU, and network usage and scales both vertically and horizontally to support your application's requirements.",
+    "type": "api-change"
+  }
+]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 CHANGELOG
 =========
 
+1.33.1
+======
+
+* api-change:``elasticache``: Launching Amazon ElastiCache Serverless that enables you to create a cache in under a minute without any capacity management. ElastiCache Serverless monitors the cache's memory, CPU, and network usage and scales both vertically and horizontally to support your application's requirements.
+
+
 1.33.0
 ======
 

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

diff --git a/botocore/data/elasticache/2015-02-02/endpoint-rule-set-1.json b/botocore/data/elasticache/2015-02-02/endpoint-rule-set-1.json
@@ -40,7 +40,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -83,7 +82,8 @@
                     },
                     "type": "endpoint"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [
@@ -96,7 +96,6 @@
                     ]
                 }
             ],
-            "type": "tree",
             "rules": [
                 {
                     "conditions": [
@@ -110,7 +109,6 @@
                             "assign": "PartitionResult"
                         }
                     ],
-                    "type": "tree",
                     "rules": [
                         {
                             "conditions": [
@@ -133,7 +131,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -168,7 +165,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -179,14 +175,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS and DualStack are enabled, but this partition does not support one or both",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -200,14 +198,12 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
                                         {
                                             "fn": "booleanEquals",
                                             "argv": [
-                                                true,
                                                 {
                                                     "fn": "getAttr",
                                                     "argv": [
@@ -216,18 +212,17 @@
                                                         },
                                                         "supportsFIPS"
                                                     ]
-                                                }
+                                                },
+                                                true
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [
                                                 {
                                                     "fn": "stringEquals",
                                                     "argv": [
-                                                        "aws-us-gov",
                                                         {
                                                             "fn": "getAttr",
                                                             "argv": [
@@ -236,7 +231,8 @@
                                                                 },
                                                                 "name"
                                                             ]
-                                                        }
+                                                        },
+                                                        "aws-us-gov"
                                                     ]
                                                 }
                                             ],
@@ -256,14 +252,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "FIPS is enabled but this partition does not support FIPS",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [
@@ -277,7 +275,6 @@
                                     ]
                                 }
                             ],
-                            "type": "tree",
                             "rules": [
                                 {
                                     "conditions": [
@@ -297,7 +294,6 @@
                                             ]
                                         }
                                     ],
-                                    "type": "tree",
                                     "rules": [
                                         {
                                             "conditions": [],
@@ -308,14 +304,16 @@
                                             },
                                             "type": "endpoint"
                                         }
-                                    ]
+                                    ],
+                                    "type": "tree"
                                 },
                                 {
                                     "conditions": [],
                                     "error": "DualStack is enabled but this partition does not support DualStack",
                                     "type": "error"
                                 }
-                            ]
+                            ],
+                            "type": "tree"
                         },
                         {
                             "conditions": [],
@@ -326,9 +324,11 @@
                             },
                             "type": "endpoint"
                         }
-                    ]
+                    ],
+                    "type": "tree"
                 }
-            ]
+            ],
+            "type": "tree"
         },
         {
             "conditions": [],

diff --git a/botocore/data/elasticache/2015-02-02/paginators-1.json b/botocore/data/elasticache/2015-02-02/paginators-1.json
@@ -101,6 +101,18 @@
       "limit_key": "MaxRecords",
       "output_token": "Marker",
       "result_key": "Users"
+    },
+    "DescribeServerlessCacheSnapshots": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "ServerlessCacheSnapshots"
+    },
+    "DescribeServerlessCaches": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "ServerlessCaches"
     }
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,12 @@ @@
     CHANGELOG
     =========
+.33.1
+    ======
+    * api-change:``elasticache``: Launching Amazon ElastiCache Serverless that enables you to create a cache in under a minute without any capacity management. ElastiCache Serverless monitors the cache's memory, CPU, and network usage and scales both vertically and horizontally to support your application's requirements.
 .33.0
     ======
@@ Expand Down @@